diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2014-02-10 20:15:58 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2014-02-10 20:15:58 +0000 |
| commit | ebb09f85e1117962f32bbe638f71b6196d6a7b8d (patch) | |
| tree | 6f9e3c37d52efc75f4349c682f432aa41a716f86 | |
| parent | 0ac645c1c32e2462c87378df16e0308d4f7af0b7 (diff) | |
| download | cygnal-ebb09f85e1117962f32bbe638f71b6196d6a7b8d.tar.gz cygnal-ebb09f85e1117962f32bbe638f71b6196d6a7b8d.tar.bz2 cygnal-ebb09f85e1117962f32bbe638f71b6196d6a7b8d.zip | |
* cygheap.cc (cwcsdup): Change parameter to correct PWCSTR.
(cwcsdup1): Ditto.
* cygheap_malloc.h: Change declarations accordingly.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/cygwin/cygheap.cc | 6 | ||||
| -rw-r--r-- | winsup/cygwin/cygheap_malloc.h | 8 |
3 files changed, 13 insertions, 7 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 6ad0ed256..e9c2e1455 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,11 @@ 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> + * uinfo.cc (pwdgrp::fetch_account_from_windows): Add code to allow setting the primary group from the SAM comment field. diff --git a/winsup/cygwin/cygheap.cc b/winsup/cygwin/cygheap.cc index ea6eaa1a9..1ccbbaf5f 100644 --- a/winsup/cygwin/cygheap.cc +++ b/winsup/cygwin/cygheap.cc @@ -1,7 +1,7 @@ /* cygheap.cc: Cygwin heap manager. 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. @@ -478,7 +478,7 @@ ccalloc_abort (cygheap_types x, size_t n, size_t size) } extern "C" PWCHAR __reg1 -cwcsdup (const PWCHAR s) +cwcsdup (PCWSTR s) { MALLOC_CHECK; PWCHAR p = (PWCHAR) cmalloc (HEAP_STR, (wcslen (s) + 1) * sizeof (WCHAR)); @@ -490,7 +490,7 @@ cwcsdup (const PWCHAR s) } extern "C" PWCHAR __reg1 -cwcsdup1 (const PWCHAR s) +cwcsdup1 (PCWSTR s) { MALLOC_CHECK; PWCHAR p = (PWCHAR) cmalloc (HEAP_1_STR, (wcslen (s) + 1) * sizeof (WCHAR)); diff --git a/winsup/cygwin/cygheap_malloc.h b/winsup/cygwin/cygheap_malloc.h index a4ab2462e..088243ee3 100644 --- a/winsup/cygwin/cygheap_malloc.h +++ b/winsup/cygwin/cygheap_malloc.h @@ -1,7 +1,7 @@ /* cygheap_malloc.h: Cygwin heap manager allocation functions. - Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011 - Red Hat, Inc. + Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011, + 2014 Red Hat, Inc. 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 crealloc_abort (void *, size_t); void *__reg3 ccalloc_abort (cygheap_types, size_t, size_t); -PWCHAR __reg1 cwcsdup (const PWCHAR); -PWCHAR __reg1 cwcsdup1 (const PWCHAR); +PWCHAR __reg1 cwcsdup (PCWSTR); +PWCHAR __reg1 cwcsdup1 (PCWSTR); char *__reg1 cstrdup (const char *); char *__reg1 cstrdup1 (const char *); void __reg2 cfree_and_set (char *&, char * = NULL); |