* cygheap_malloc.h: New file.
* cygheap.h: Remove stuff now included in cygheap_malloc.h and include that file. Make cygheap_init a standard c++ function. Remove unneeded child_info declaration. * path.h: Include cygheap_malloc.h. Remove extra cstrdup declaration. (path_conv): Reorganize to group variables together. (path_conv::path): Make const char *. (path_conv::known_suffix): Ditto. (path_conv::normalized_path): Ditto. (path_conv::path_conv): Reorganize initializers to reflect new element ordering. (path_conv::get_win32): Change return value to const char *. (path_conv::set_path): Move back here from spawn.cc. (parh_conv::modifiable_path): New function. * path.cc (path_conv::add_ext_from_sym): Accommodate const'ness of known_suffixes. (path_conv::set_normalized_path): Ditto for normalized_path. (path_conv::check): Use modifiable_path whereever we need to modify the path element. Use set_path to set the path. (path_conv::~path_conv): Accommodate new const'ness. * spawn.cc (perhaps_suffix): Declare ext as const since that's what is being returned. (path_conv::set_path): Move back to path.h. * winf.f (linebuf): Perform minor cleanup. (linebuf::fromargv): Change second parameter to const. * winf.cc (linebuf::fromargv): Ditto.
This commit is contained in:
@@ -9,31 +9,7 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for
|
||||
details. */
|
||||
|
||||
#include "hires.h"
|
||||
|
||||
#undef cfree
|
||||
|
||||
enum cygheap_types
|
||||
{
|
||||
HEAP_FHANDLER,
|
||||
HEAP_STR,
|
||||
HEAP_ARGV,
|
||||
HEAP_BUF,
|
||||
HEAP_MOUNT,
|
||||
HEAP_SIGS,
|
||||
HEAP_ARCHETYPES,
|
||||
HEAP_TLS,
|
||||
HEAP_COMMUNE,
|
||||
HEAP_1_START,
|
||||
HEAP_1_HOOK,
|
||||
HEAP_1_STR,
|
||||
HEAP_1_ARGV,
|
||||
HEAP_1_BUF,
|
||||
HEAP_1_EXEC,
|
||||
HEAP_1_MAX = 100,
|
||||
HEAP_2_STR,
|
||||
HEAP_2_DLL,
|
||||
HEAP_MMAP = 200
|
||||
};
|
||||
#include "cygheap_malloc.h"
|
||||
|
||||
#define incygheap(s) (cygheap && ((char *) (s) >= (char *) cygheap) && ((char *) (s) <= ((char *) cygheap_max)))
|
||||
|
||||
@@ -437,21 +413,6 @@ class cygheap_fdenum : public cygheap_fdmanip
|
||||
}
|
||||
};
|
||||
|
||||
class child_info;
|
||||
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)));
|
||||
void *__stdcall cmalloc_abort (cygheap_types, DWORD) __attribute__ ((regparm(2)));
|
||||
void *__stdcall crealloc_abort (void *, DWORD) __attribute__ ((regparm(2)));
|
||||
void *__stdcall ccalloc_abort (cygheap_types, DWORD, DWORD) __attribute__ ((regparm(3)));
|
||||
PWCHAR __stdcall cwcsdup (const PWCHAR) __attribute__ ((regparm(1)));
|
||||
PWCHAR __stdcall cwcsdup1 (const PWCHAR) __attribute__ ((regparm(1)));
|
||||
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 char _cygheap_start[] __attribute__((section(".idata")));
|
||||
}
|
||||
|
Reference in New Issue
Block a user