libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cygwin: drop macro and code for CYGWIN_VERSION_DLL_MALLOC_ENV 

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2022-08-03 15:35:07 +02:00
parent 02b273a688
commit efa6611982
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
winsup/cygwin/environ.cc
View File

@ -291,10 +291,6 @@ env_path_to_win32 (const void *posix, void *win32, size_t size)
win32, size); win32, size);
} }
#define ENVMALLOC \
(CYGWIN_VERSION_DLL_MAKE_COMBINED (user_data->api_major, user_data->api_minor) \
<= CYGWIN_VERSION_DLL_MALLOC_ENV)
#define NL(x) x, (sizeof (x) - 1) #define NL(x) x, (sizeof (x) - 1)
/* List of names which are converted from dos to unix /* List of names which are converted from dos to unix
on the way in and back again on the way out. on the way in and back again on the way out.
@ -631,7 +627,7 @@ _addenv (const char *name, const char *value, int overwrite)
char *envhere; char *envhere;
if (!issetenv) if (!issetenv)
/* Not setenv. Just overwrite existing. */ /* Not setenv. Just overwrite existing. */
envhere = environ[offset] = (char *) (ENVMALLOC ? strdup (name) : name); envhere = environ[offset] = (char *) name;
else else
{ /* setenv */ { /* setenv */
/* Look for an '=' in the name and ignore anything after that if found. */ /* Look for an '=' in the name and ignore anything after that if found. */
@ -817,13 +813,6 @@ environ_init (char **envp, int envc)
/* Older applications relied on the fact that cygwin malloced elements of the /* Older applications relied on the fact that cygwin malloced elements of the
environment list. */ environment list. */
envp = newenv; envp = newenv;
if (ENVMALLOC)
for (char **e = newenv; *e; e++)
{
char *p = *e;
*e = strdup (p);
cfree (p);
}
envp_passed_in = 1; envp_passed_in = 1;
goto out; goto out;
} }

2
winsup/cygwin/include/cygwin/version.h
View File

@ -34,8 +34,6 @@ details. */
#define CYGWIN_VERSION_USER_API_VERSION_COMBINED \ #define CYGWIN_VERSION_USER_API_VERSION_COMBINED \
CYGWIN_VERSION_PER_PROCESS_API_VERSION_COMBINED (user_data) CYGWIN_VERSION_PER_PROCESS_API_VERSION_COMBINED (user_data)
#define CYGWIN_VERSION_DLL_MALLOC_ENV 28
/* Old APIs had getc/putc macros that conflict with new CR/LF handling in the /* Old APIs had getc/putc macros that conflict with new CR/LF handling in the
stdio buffers */ stdio buffers */
#define CYGWIN_VERSION_OLD_STDIO_CRLF_HANDLING \ #define CYGWIN_VERSION_OLD_STDIO_CRLF_HANDLING \