This commit was manufactured by cvs2svn to create tag 'cygwin-cygwin-1_7_12-release

1_7_12-release'.

Sprout from cygwin-64bit-branch 2012-08-10 09:37:33 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'cygwin-64bit-'
Cherrypick from master 2012-04-03 07:28:48 UTC Corinna Vinschen <corinna@vinschen.de> '	* syscalls.cc (fhandler_base::stat_fixup): Replace string comparison':
    COPYING3
    COPYING3.LIB
    ChangeLog
    MAINTAINERS
    compile
    config.rpath
    config.sub
    config/ChangeLog
    config/mh-darwin
    config/mh-interix
    config/mh-ppc-aix
    config/mt-alphaieee
    config/mt-sde
    config/picflag.m4
    config/stdint.m4
    config/tcl.m4
    configure
    configure.ac
    include/ChangeLog
    include/bfdlink.h
    include/dis-asm.h
    include/dwarf2.h
    include/elf/ChangeLog
    include/elf/avr.h
    include/elf/common.h
    include/elf/m68hc11.h
    include/elf/ppc.h
    include/elf/s390.h
    include/elf/sparc.h
    include/filenames.h
    include/gdb/ChangeLog
    include/gdb/callback.h
    include/gdb/signals.def
    include/gdb/signals.h
    include/mach-o/ChangeLog
    include/mach-o/codesign.h
    include/mach-o/external.h
    include/mach-o/loader.h
    include/mach-o/reloc.h
    include/mach-o/x86-64.h
    include/opcode/ChangeLog
    include/opcode/avr.h
    include/opcode/m68hc11.h
    include/opcode/mips.h
    include/opcode/ppc.h
    include/opcode/sparc.h
    include/plugin-api.h
    include/splay-tree.h
    ltgcc.m4
    ltoptions.m4
    ltversion.m4
    lt~obsolete.m4
    newlib/ChangeLog
    newlib/doc/Makefile.am
    newlib/doc/Makefile.in
    newlib/libc/include/stdio.h
    newlib/libc/include/string.h
    newlib/libc/include/sys/signal.h
    newlib/libc/include/sys/stat.h
    newlib/libc/include/sys/time.h
    newlib/libc/include/sys/times.h
    newlib/libc/include/sys/types.h
    newlib/libc/include/sys/unistd.h
    newlib/libc/include/sys/wait.h
    newlib/libc/locale/lmessages.c
    newlib/libc/locale/lmonetary.c
    newlib/libc/locale/nl_langinfo.c
    newlib/libc/machine/cr16/sys/asm.h
    newlib/libc/machine/epiphany/Makefile.am
    newlib/libc/machine/epiphany/Makefile.in
    newlib/libc/machine/epiphany/aclocal.m4
    newlib/libc/machine/epiphany/configure
    newlib/libc/machine/epiphany/configure.in
    newlib/libc/machine/epiphany/machine/stdlib.h
    newlib/libc/machine/epiphany/setjmp.S
    newlib/libc/machine/rl78/Makefile.am
    newlib/libc/machine/rl78/Makefile.in
    newlib/libc/machine/rl78/aclocal.m4
    newlib/libc/machine/rl78/configure
    newlib/libc/machine/rl78/configure.in
    newlib/libc/machine/rl78/setjmp.S
    newlib/libc/posix/collate.c
    newlib/libc/posix/engine.c
    newlib/libc/posix/glob.c
    newlib/libc/posix/popen.c
    newlib/libc/posix/readdir.c
    newlib/libc/posix/regcomp.c
    newlib/libc/posix/telldir.c
    newlib/libc/posix/wordexp.c
    newlib/libc/reent/mkdirr.c
    newlib/libc/reent/renamer.c
    newlib/libc/search/hash.c
    newlib/libc/search/hash_bigkey.c
    newlib/libc/search/hash_page.c
    newlib/libc/search/hcreate_r.c
    newlib/libc/stdio/asiprintf.c
    newlib/libc/stdio/asprintf.c
    newlib/libc/stdio/clearerr.c
    newlib/libc/stdio/fclose.c
    newlib/libc/stdio/fdopen.c
    newlib/libc/stdio/feof.c
    newlib/libc/stdio/ferror.c
    newlib/libc/stdio/fflush.c
    newlib/libc/stdio/fgetc.c
    newlib/libc/stdio/fgets.c
    newlib/libc/stdio/fgetwc.c
    newlib/libc/stdio/fgetws.c
    newlib/libc/stdio/fileno.c
    newlib/libc/stdio/findfp.c
    newlib/libc/stdio/fmemopen.c
    newlib/libc/stdio/fopen.c
    newlib/libc/stdio/fopencookie.c
    newlib/libc/stdio/fpurge.c
    newlib/libc/stdio/fputc.c
    newlib/libc/stdio/fputs.c
    newlib/libc/stdio/fputwc.c
    newlib/libc/stdio/fputws.c
    newlib/libc/stdio/fread.c
    newlib/libc/stdio/freopen.c
    newlib/libc/stdio/fseek.c
    newlib/libc/stdio/ftell.c
    newlib/libc/stdio/funopen.c
    newlib/libc/stdio/fwide.c
    newlib/libc/stdio/fwrite.c
    newlib/libc/stdio/getc.c
    newlib/libc/stdio/getdelim.c
    newlib/libc/stdio/gets.c
    newlib/libc/stdio/local.h
    newlib/libc/stdio/mktemp.c
    newlib/libc/stdio/open_memstream.c
    newlib/libc/stdio/putc.c
    newlib/libc/stdio/setvbuf.c
    newlib/libc/stdio/ungetc.c
    newlib/libc/stdio/ungetwc.c
    newlib/libc/stdio/vasiprintf.c
    newlib/libc/stdio/vasprintf.c
    newlib/libc/stdio/vfprintf.c
    newlib/libc/stdio/vfscanf.c
    newlib/libc/stdio/vfwprintf.c
    newlib/libc/stdio/vfwscanf.c
    newlib/libc/stdio64/fdopen64.c
    newlib/libc/stdio64/fopen64.c
    newlib/libc/stdio64/freopen64.c
    newlib/libc/stdio64/fseeko64.c
    newlib/libc/stdio64/ftello64.c
    newlib/libc/stdlib/mbtowc_r.c
    newlib/libc/stdlib/mprec.h
    newlib/libc/stdlib/wctomb_r.c
    newlib/libc/string/Makefile.am
    newlib/libc/string/Makefile.in
    newlib/libc/string/strcasestr.c
    newlib/libc/sys/epiphany/Makefile.am
    newlib/libc/sys/epiphany/Makefile.in
    newlib/libc/sys/epiphany/aclocal.m4
    newlib/libc/sys/epiphany/configure
    newlib/libc/sys/epiphany/configure.in
    newlib/libc/sys/epiphany/e_printf.c
    newlib/libc/sys/rtems/crt0.c
    newlib/libc/sys/rtems/machine/_types.h
    newlib/libc/sys/sysnecv850/crt0.S
    newlib/libc/time/strptime.c
    newlib/libm/common/sf_round.c
    newlib/libm/math/e_atan2.c
    newlib/libm/math/e_exp.c
    newlib/libm/math/e_pow.c
    newlib/libm/math/e_rem_pio2.c
    newlib/libm/math/ef_exp.c
    newlib/libm/math/ef_pow.c
    newlib/libm/math/er_lgamma.c
    newlib/libm/math/erf_lgamma.c
    newlib/testsuite/newlib.stdio/stdio.exp
    newlib/testsuite/newlib.stdio/swprintf.c
    newlib/testsuite/newlib.string/strcmp-1.c
    winsup/ChangeLog
    winsup/Makefile.common
    winsup/cygserver/ChangeLog
    winsup/cygserver/woutsup.h
    winsup/cygwin/ChangeLog
    winsup/cygwin/Makefile.in
    winsup/cygwin/advapi32.cc
    winsup/cygwin/child_info.h
    winsup/cygwin/configure.in
    winsup/cygwin/cygheap.cc
    winsup/cygwin/cygheap.h
    winsup/cygwin/cygserver_ipc.h
    winsup/cygwin/cygthread.cc
    winsup/cygwin/cygtls.cc
    winsup/cygwin/cygtls.h
    winsup/cygwin/cygwin.din
    winsup/cygwin/cygwin.sc
    winsup/cygwin/dcrt0.cc
    winsup/cygwin/devices.cc
    winsup/cygwin/devices.in
    winsup/cygwin/dll_init.cc
    winsup/cygwin/dtable.cc
    winsup/cygwin/dtable.h
    winsup/cygwin/environ.cc
    winsup/cygwin/exceptions.cc
    winsup/cygwin/external.cc
    winsup/cygwin/fenv.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_mem.cc
    winsup/cygwin/fhandler_nodevice.cc
    winsup/cygwin/fhandler_procnet.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/flock.cc
    winsup/cygwin/fork.cc
    winsup/cygwin/gendef
    winsup/cygwin/gentls_offsets
    winsup/cygwin/globals.cc
    winsup/cygwin/heap.cc
    winsup/cygwin/hookapi.cc
    winsup/cygwin/include/cygwin/if.h
    winsup/cygwin/include/cygwin/in.h
    winsup/cygwin/include/cygwin/socket.h
    winsup/cygwin/include/cygwin/version.h
    winsup/cygwin/include/elf.h
    winsup/cygwin/include/inttypes.h
    winsup/cygwin/include/mntent.h
    winsup/cygwin/include/netdb.h
    winsup/cygwin/include/stdint.h
    winsup/cygwin/include/sys/elf32.h
    winsup/cygwin/include/sys/elf64.h
    winsup/cygwin/include/sys/elf_common.h
    winsup/cygwin/include/sys/elf_generic.h
    winsup/cygwin/include/sys/wait.h
    winsup/cygwin/kernel32.cc
    winsup/cygwin/lib/_cygwin_crt0_common.cc
    winsup/cygwin/lib/crt0.h
    winsup/cygwin/libc/inet_addr.c
    winsup/cygwin/libc/inet_network.c
    winsup/cygwin/libc/minires-os-if.c
    winsup/cygwin/libc/minires.h
    winsup/cygwin/libc/rcmd.cc
    winsup/cygwin/miscfuncs.cc
    winsup/cygwin/miscfuncs.h
    winsup/cygwin/mkvers.sh
    winsup/cygwin/mmap.cc
    winsup/cygwin/mount.cc
    winsup/cygwin/mount.h
    winsup/cygwin/net.cc
    winsup/cygwin/ntdll.h
    winsup/cygwin/passwd.cc
    winsup/cygwin/path.cc
    winsup/cygwin/path.h
    winsup/cygwin/pinfo.cc
    winsup/cygwin/pipe.cc
    winsup/cygwin/poll.cc
    winsup/cygwin/posix.sgml
    winsup/cygwin/posix_ipc.cc
    winsup/cygwin/pseudo-reloc.cc
    winsup/cygwin/regex/regcomp.c
    winsup/cygwin/registry.cc
    winsup/cygwin/release/1.7.10
    winsup/cygwin/release/1.7.11
    winsup/cygwin/release/1.7.12
    winsup/cygwin/sched.cc
    winsup/cygwin/sec_helper.cc
    winsup/cygwin/security.cc
    winsup/cygwin/security.h
    winsup/cygwin/select.cc
    winsup/cygwin/select.h
    winsup/cygwin/shared.cc
    winsup/cygwin/signal.cc
    winsup/cygwin/sigproc.cc
    winsup/cygwin/sigproc.h
    winsup/cygwin/smallprint.cc
    winsup/cygwin/spawn.cc
    winsup/cygwin/strace.cc
    winsup/cygwin/strfuncs.cc
    winsup/cygwin/syscalls.cc
    winsup/cygwin/syslog.cc
    winsup/cygwin/thread.cc
    winsup/cygwin/thread.h
    winsup/cygwin/tlsoffsets.h
    winsup/cygwin/wait.cc
    winsup/cygwin/winbase.h
    winsup/cygwin/wincap.cc
    winsup/cygwin/wincap.h
    winsup/cygwin/winlean.h
    winsup/cygwin/winsup.h
    winsup/doc/ChangeLog
    winsup/doc/configure
    winsup/doc/cygwinenv.sgml
    winsup/doc/faq-programming.xml
    winsup/doc/faq-using.xml
    winsup/doc/new-features.sgml
    winsup/doc/overview2.sgml
    winsup/doc/pathnames.sgml
    winsup/doc/setup-net.sgml
    winsup/doc/using.sgml
    winsup/lsaauth/ChangeLog
    winsup/lsaauth/Makefile.in
    winsup/lsaauth/cyglsa.c
    winsup/lsaauth/cyglsa64.dll
    winsup/lsaauth/make-64bit-version-with-mingw-w64.sh
    winsup/mingw/ChangeLog
    winsup/mingw/configure
    winsup/mingw/configure.in
    winsup/mingw/include/_mingw.h
    winsup/mingw/include/excpt.h
    winsup/mingw/include/inttypes.h
    winsup/mingw/include/limits.h
    winsup/mingw/include/process.h
    winsup/mingw/include/stdint.h
    winsup/mingw/include/stdio.h
    winsup/mingw/include/stdlib.h
    winsup/mingw/include/sys/param.h
    winsup/mingw/include/wchar.h
    winsup/mingw/mingwex/Makefile.in
    winsup/mingw/mingwex/gdtoa/gd_qnan.h
    winsup/mingw/mingwex/tsearch.c
    winsup/mingw/profile/Makefile.in
    winsup/testsuite/ChangeLog
    winsup/testsuite/configure
    winsup/utils/ChangeLog
    winsup/utils/Makefile.in
    winsup/utils/bloda.cc
    winsup/utils/cygcheck.cc
    winsup/utils/cygpath.cc
    winsup/utils/dump_setup.cc
    winsup/utils/dumper.cc
    winsup/utils/locale.cc
    winsup/utils/mkgroup.c
    winsup/utils/mkpasswd.c
    winsup/utils/ps.cc
    winsup/utils/regtool.cc
    winsup/utils/strace.cc
    winsup/w32api/ChangeLog
    winsup/w32api/include/setupapi.h
    winsup/w32api/include/winbase.h
    winsup/w32api/include/windows.h
    winsup/w32api/include/winnt.h
    winsup/w32api/include/winsock.h
    winsup/w32api/include/winsock2.h
    winsup/w32api/include/winuser.h
    winsup/w32api/include/winver.h
    winsup/w32api/include/wtsapi32.h
    winsup/w32api/lib/Makefile.in
    winsup/w32api/lib/kernel32.def
    winsup/w32api/lib/wtsapi32.def
Delete:
    config/asmcfi.m4
    config/math.m4
    config/mmap.m4
    config/weakref.m4
    include/dwarf2.def
    include/elf/xgate.h
    include/gdb/gdb-index.h
    include/leb128.h
    include/opcode/xgate.h
    newlib/libc/string/memrchr.c
    winsup/cygwin/DevNotes
    winsup/cygwin/cygwait.cc
    winsup/cygwin/cygwait.h
    winsup/cygwin/include/machine/elf.h
    winsup/cygwin/include/sys/elf.h
    winsup/mingw/mingwex/membarrier.c
    winsup/w32api/include/sdkddkver.h
    winsup/w32api/include/shobjidl.h
    winsup/w32api/lib/shobjidl-uuid.c

1 files changed, 59 insertions, 27 deletions

diff --git a/winsup/cygwin/ntdll.h b/winsup/cygwin/ntdll.h
index 2ca6a5ab3..7eee720aa 100644
--- a/winsup/cygwin/ntdll.h
+++ b/winsup/cygwin/ntdll.h
@@ -9,20 +9,70 @@
    Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
    details. */
 
-#pragma once
-
-#ifndef __MINGW64_VERSION_MAJOR
-# include <ddk/ntstatus.h>
-#else
-# include <ntstatus.h>
+#ifndef _NTDLL_H
+#define _NTDLL_H 1
+
+/* NTSTATUS values. */
+#define STATUS_NOT_ALL_ASSIGNED       ((NTSTATUS) 0x00000106)
+#define STATUS_OBJECT_NAME_EXISTS     ((NTSTATUS) 0x40000000)
+#define STATUS_BUFFER_OVERFLOW        ((NTSTATUS) 0x80000005)
+#define STATUS_NO_MORE_FILES          ((NTSTATUS) 0x80000006)
+#ifdef STATUS_INVALID_INFO_CLASS /* Defined as unsigned value in subauth.h */
+#undef STATUS_INVALID_INFO_CLASS
+#endif
+#define STATUS_INVALID_INFO_CLASS     ((NTSTATUS) 0xc0000003)
+#define STATUS_NOT_IMPLEMENTED        ((NTSTATUS) 0xc0000002)
+#define STATUS_INFO_LENGTH_MISMATCH   ((NTSTATUS) 0xc0000004)
+#ifdef STATUS_INVALID_HANDLE     /* Defined as unsigned value in winbase.h */
+#undef STATUS_INVALID_HANDLE
 #endif
+#define STATUS_INVALID_HANDLE         ((NTSTATUS) 0xc0000008)
+#define STATUS_INVALID_PARAMETER      ((NTSTATUS) 0xc000000d)
+#define STATUS_NO_SUCH_FILE           ((NTSTATUS) 0xc000000f)
+#define STATUS_INVALID_DEVICE_REQUEST ((NTSTATUS) 0xc0000010)
+#define STATUS_END_OF_FILE            ((NTSTATUS) 0xc0000011)
+#define STATUS_NO_MEDIA_IN_DEVICE     ((NTSTATUS) 0xc0000013)
+#define STATUS_ACCESS_DENIED          ((NTSTATUS) 0xc0000022)
+#define STATUS_BUFFER_TOO_SMALL       ((NTSTATUS) 0xc0000023)
+#define STATUS_OBJECT_TYPE_MISMATCH   ((NTSTATUS) 0xc0000024)
+#define STATUS_OBJECT_NAME_INVALID    ((NTSTATUS) 0xc0000033)
+#define STATUS_OBJECT_NAME_NOT_FOUND  ((NTSTATUS) 0xc0000034)
+#define STATUS_OBJECT_NAME_COLLISION  ((NTSTATUS) 0xc0000035)
+#define STATUS_OBJECT_PATH_NOT_FOUND  ((NTSTATUS) 0xc000003A)
+#define STATUS_SHARING_VIOLATION      ((NTSTATUS) 0xc0000043)
+#define STATUS_EAS_NOT_SUPPORTED      ((NTSTATUS) 0xc000004f)
+#define STATUS_EA_TOO_LARGE           ((NTSTATUS) 0xc0000050)
+#define STATUS_NONEXISTENT_EA_ENTRY   ((NTSTATUS) 0xc0000051)
+#define STATUS_NO_EAS_ON_FILE         ((NTSTATUS) 0xc0000052)
+#define STATUS_LOCK_NOT_GRANTED       ((NTSTATUS) 0xc0000055)
+#define STATUS_DELETE_PENDING         ((NTSTATUS) 0xc0000056)
+#define STATUS_PROCEDURE_NOT_FOUND    ((NTSTATUS) 0xc000007a)
+#define STATUS_DISK_FULL              ((NTSTATUS) 0xc000007f)
+#define STATUS_WORKING_SET_QUOTA      ((NTSTATUS) 0xc00000a1)
+#define STATUS_INSTANCE_NOT_AVAILABLE ((NTSTATUS) 0xc00000ab)
+#define STATUS_PIPE_NOT_AVAILABLE     ((NTSTATUS) 0xc00000ac)
+#define STATUS_INVALID_PIPE_STATE     ((NTSTATUS) 0xc00000ad)
+#define STATUS_PIPE_BUSY              ((NTSTATUS) 0xc00000ae)
+#define STATUS_NOT_SUPPORTED          ((NTSTATUS) 0xc00000bb)
+#define STATUS_BAD_NETWORK_PATH       ((NTSTATUS) 0xc00000be)
+#define STATUS_INVALID_NETWORK_RESPONSE ((NTSTATUS) 0xc00000c3)
+#define STATUS_BAD_NETWORK_NAME       ((NTSTATUS) 0xc00000cc)
+#define STATUS_DIRECTORY_NOT_EMPTY    ((NTSTATUS) 0xc0000101)
+#define STATUS_PROCESS_IS_TERMINATING ((NTSTATUS) 0xc000010a)
+#define STATUS_CANNOT_DELETE          ((NTSTATUS) 0xc0000121)
+#define STATUS_INVALID_LEVEL          ((NTSTATUS) 0xc0000148)
+#define STATUS_DLL_NOT_FOUND          ((NTSTATUS) 0xc0000135)
+#define STATUS_ENTRYPOINT_NOT_FOUND   ((NTSTATUS) 0xc0000139)
+#define STATUS_NOT_FOUND              ((NTSTATUS) 0xc0000225)
+#define STATUS_BAD_DLL_ENTRYPOINT     ((NTSTATUS) 0xc0000251)
+#define STATUS_ILLEGAL_DLL_RELOCATION ((NTSTATUS) 0xc0000269)
 /* custom status code: */
 #define STATUS_ILLEGAL_DLL_PSEUDO_RELOCATION ((NTSTATUS) 0xe0000269)
 
 #define NtCurrentProcess() ((HANDLE) 0xffffffff)
 #define NtCurrentThread()  ((HANDLE) 0xfffffffe)
 
-/* Creation information returned in IO_STATUS_BLOCK. */
+/* CreateDisposition in NtCreateFile call. */
 #define FILE_SUPERSEDED     0
 #define FILE_OPENED         1
 #define FILE_CREATED        2
@@ -490,8 +540,7 @@ typedef enum _PROCESSINFOCLASS
   ProcessVmCounters = 3,
   ProcessTimes = 4,
   ProcessSessionInformation = 24,
-  ProcessWow64Information = 26,
-  ProcessImageFileName = 27
+  ProcessWow64Information = 26
 } PROCESSINFOCLASS;
 
 typedef struct _DEBUG_BUFFER
@@ -973,13 +1022,11 @@ typedef struct _FILE_MAILSLOT_SET_INFORMATION
 
 typedef VOID NTAPI (*PIO_APC_ROUTINE)(PVOID, PIO_STATUS_BLOCK, ULONG);
 
-#ifndef __MINGW64_VERSION_MAJOR
 typedef enum _EVENT_TYPE
 {
   NotificationEvent = 0,
   SynchronizationEvent
 } EVENT_TYPE, *PEVENT_TYPE;
-#endif
 
 typedef struct _EVENT_BASIC_INFORMATION
 {
@@ -1046,21 +1093,11 @@ typedef struct _KEY_VALUE_PARTIAL_INFORMATION
   UCHAR Data[1];
 } KEY_VALUE_PARTIAL_INFORMATION, *PKEY_VALUE_PARTIAL_INFORMATION;
 
-#ifndef __MINGW64_VERSION_MAJOR
 typedef enum _TIMER_TYPE
 {
   NotificationTimer,
   SynchronisationTimer
 } TIMER_TYPE, *PTIMER_TYPE;
-#endif
-
-#ifdef __MINGW64_VERSION_MAJOR
-typedef enum _SECTION_INHERIT
-{
-  ViewShare = 1,
-  ViewUnmap = 2
-} SECTION_INHERIT;
-#endif
 
 typedef VOID (APIENTRY *PTIMER_APC_ROUTINE)(PVOID, ULONG, ULONG);
 
@@ -1215,11 +1252,7 @@ extern "C"
 					      PSECURITY_DESCRIPTOR, PULONG);
   VOID NTAPI RtlAcquirePebLock ();
   NTSTATUS NTAPI RtlAddAccessAllowedAce (PACL, ULONG, ACCESS_MASK, PSID);
-  NTSTATUS NTAPI RtlAddAccessAllowedAceEx (PACL, ULONG, ULONG, ACCESS_MASK,
-					   PSID);
   NTSTATUS NTAPI RtlAddAccessDeniedAce (PACL, ULONG, ACCESS_MASK, PSID);
-  NTSTATUS NTAPI RtlAddAccessDeniedAceEx (PACL, ULONG, ULONG, ACCESS_MASK,
-					  PSID);
   NTSTATUS NTAPI RtlAddAce (PACL, ULONG, ULONG, PVOID, ULONG);
   PVOID NTAPI RtlAllocateHeap (PVOID, ULONG, SIZE_T);
   NTSTATUS NTAPI RtlAppendUnicodeToString (PUNICODE_STRING, PCWSTR);
@@ -1270,7 +1303,6 @@ extern "C"
 						PBOOLEAN);
   PSID_IDENTIFIER_AUTHORITY NTAPI RtlIdentifierAuthoritySid (PSID);
   VOID NTAPI RtlInitEmptyUnicodeString (PUNICODE_STRING, PCWSTR, USHORT);
-  VOID NTAPI RtlInitAnsiString (PANSI_STRING, PCSTR);
   NTSTATUS NTAPI RtlInitializeSid (PSID, PSID_IDENTIFIER_AUTHORITY, UCHAR);
   VOID NTAPI RtlInitUnicodeString (PUNICODE_STRING, PCWSTR);
   NTSTATUS NTAPI RtlIntegerToUnicodeString (ULONG, ULONG, PUNICODE_STRING);
@@ -1302,7 +1334,6 @@ extern "C"
 						BOOLEAN);
   PUCHAR NTAPI RtlSubAuthorityCountSid (PSID);
   PULONG NTAPI RtlSubAuthoritySid (PSID, ULONG);
-  ULONG NTAPI RtlUnicodeStringToAnsiSize (PUNICODE_STRING);
   NTSTATUS NTAPI RtlUnicodeStringToAnsiString (PANSI_STRING, PUNICODE_STRING,
 					       BOOLEAN);
   NTSTATUS NTAPI RtlUnicodeStringToOemString (PANSI_STRING, PUNICODE_STRING,
@@ -1424,3 +1455,4 @@ extern "C"
   }
 }
 #endif
+#endif /*_NTDLL_H*/