* Makefile.in: Don't override CC.

* cyglsa.c: Don't include wchar.h.  Declare wcscpy and wcslen instead.
	* cyglsa64.dll: Rebuild.
This commit is contained in:
Corinna Vinschen 2011-05-10 10:06:51 +00:00
parent 4964dafb65
commit d2302a485f
4 changed files with 11 additions and 3 deletions

View File

@ -1,3 +1,9 @@
2011-05-10 Corinna Vinschen <corinna@vinschen.de>
* Makefile.in: Don't override CC.
* cyglsa.c: Don't include wchar.h. Declare wcscpy and wcslen instead.
* cyglsa64.dll: Rebuild.
2011-03-31 Corinna Vinschen <corinna@vinschen.de> 2011-03-31 Corinna Vinschen <corinna@vinschen.de>
* Makefile.in (LIBS): Remove advapi32.dll. * Makefile.in (LIBS): Remove advapi32.dll.

View File

@ -29,8 +29,6 @@ INSTALL_DATA := @INSTALL_DATA@
CC := @CC@ CC := @CC@
CC_FOR_TARGET := $(CC) CC_FOR_TARGET := $(CC)
override CC := @NO_CYGWIN@ $(firstword ${CC})
CFLAGS := @CFLAGS@ CFLAGS := @CFLAGS@
include $(srcdir)/../Makefile.common include $(srcdir)/../Makefile.common

View File

@ -11,7 +11,6 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */
#define WINVER 0x0600 #define WINVER 0x0600
#include <ntstatus.h> #include <ntstatus.h>
#include <wchar.h>
#include <windows.h> #include <windows.h>
#include <wininet.h> #include <wininet.h>
#include <lmcons.h> #include <lmcons.h>
@ -49,6 +48,11 @@ ULONG NTAPI RtlLengthSid (PSID);
PULONG NTAPI RtlSubAuthoritySid (PSID, ULONG); PULONG NTAPI RtlSubAuthoritySid (PSID, ULONG);
PUCHAR NTAPI RtlSubAuthorityCountSid (PSID); PUCHAR NTAPI RtlSubAuthorityCountSid (PSID);
BOOLEAN NTAPI RtlValidSid (PSID); BOOLEAN NTAPI RtlValidSid (PSID);
/* These standard POSIX functions are implemented in NTDLL and exported.
There's just no header to define them and using wchar.h from mingw
or Cygwin seems wrong somehow. */
wchar_t *__cdecl wcscpy (wchar_t *, const wchar_t *);
size_t __cdecl wcslen (const wchar_t *);
#ifndef RtlInitEmptyUnicodeString #ifndef RtlInitEmptyUnicodeString
__inline VOID NTAPI __inline VOID NTAPI

Binary file not shown.