JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* cygheap.cc (cwcsdup): Change parameter to correct PWCSTR.

Browse Source 
(cwcsdup1): Ditto.
	* cygheap_malloc.h: Change declarations accordingly.
This commit is contained in:
Corinna Vinschen 2014-02-10 20:15:58 +00:00
parent 0ac645c1c3
commit ebb09f85e1
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2014-02-10 Corinna Vinschen <corinna@vinschen.de>
* cygheap.cc (cwcsdup): Change parameter to correct PWCSTR.
(cwcsdup1): Ditto.
* cygheap_malloc.h: Change declarations accordingly.
2014-02-10 Corinna Vinschen <corinna@vinschen.de> 2014-02-10 Corinna Vinschen <corinna@vinschen.de>
* uinfo.cc (pwdgrp::fetch_account_from_windows): Add code to allow * uinfo.cc (pwdgrp::fetch_account_from_windows): Add code to allow

6
winsup/cygwin/cygheap.cc
View File

@ -1,7 +1,7 @@
/* cygheap.cc: Cygwin heap manager. /* cygheap.cc: Cygwin heap manager.
Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
2011, 2012, 2013 Red Hat, Inc. 2011, 2012, 2013, 2014 Red Hat, Inc.
This file is part of Cygwin. This file is part of Cygwin.
@ -478,7 +478,7 @@ ccalloc_abort (cygheap_types x, size_t n, size_t size)
} }
extern "C" PWCHAR __reg1 extern "C" PWCHAR __reg1
cwcsdup (const PWCHAR s) cwcsdup (PCWSTR s)
{ {
MALLOC_CHECK; MALLOC_CHECK;
PWCHAR p = (PWCHAR) cmalloc (HEAP_STR, (wcslen (s) + 1) * sizeof (WCHAR)); PWCHAR p = (PWCHAR) cmalloc (HEAP_STR, (wcslen (s) + 1) * sizeof (WCHAR));
@ -490,7 +490,7 @@ cwcsdup (const PWCHAR s)
} }
extern "C" PWCHAR __reg1 extern "C" PWCHAR __reg1
cwcsdup1 (const PWCHAR s) cwcsdup1 (PCWSTR s)
{ {
MALLOC_CHECK; MALLOC_CHECK;
PWCHAR p = (PWCHAR) cmalloc (HEAP_1_STR, (wcslen (s) + 1) * sizeof (WCHAR)); PWCHAR p = (PWCHAR) cmalloc (HEAP_1_STR, (wcslen (s) + 1) * sizeof (WCHAR));

8
winsup/cygwin/cygheap_malloc.h
View File

@ -1,7 +1,7 @@
/* cygheap_malloc.h: Cygwin heap manager allocation functions. /* cygheap_malloc.h: Cygwin heap manager allocation functions.
Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011 Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011,
Red Hat, Inc. 2014 Red Hat, Inc.
This file is part of Cygwin. This file is part of Cygwin.
@ -48,8 +48,8 @@ void *__reg3 ccalloc (cygheap_types, size_t, size_t);
void *__reg2 cmalloc_abort (cygheap_types, size_t); void *__reg2 cmalloc_abort (cygheap_types, size_t);
void *__reg2 crealloc_abort (void *, size_t); void *__reg2 crealloc_abort (void *, size_t);
void *__reg3 ccalloc_abort (cygheap_types, size_t, size_t); void *__reg3 ccalloc_abort (cygheap_types, size_t, size_t);
PWCHAR __reg1 cwcsdup (const PWCHAR); PWCHAR __reg1 cwcsdup (PCWSTR);
PWCHAR __reg1 cwcsdup1 (const PWCHAR); PWCHAR __reg1 cwcsdup1 (PCWSTR);
char *__reg1 cstrdup (const char *); char *__reg1 cstrdup (const char *);
char *__reg1 cstrdup1 (const char *); char *__reg1 cstrdup1 (const char *);
void __reg2 cfree_and_set (char *&, char * = NULL); void __reg2 cfree_and_set (char *&, char * = NULL);