Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
a88f03e2
Commit
a88f03e2
authored
Jan 08, 2008
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Jan 08, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcrt: Rename _environ to avoid a conflict on Solaris.
parent
fb5d0bfe
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
11 deletions
+11
-11
data.c
dlls/msvcrt/data.c
+5
-5
environ.c
dlls/msvcrt/environ.c
+4
-4
msvcrt.h
dlls/msvcrt/msvcrt.h
+1
-1
msvcrt.spec
dlls/msvcrt/msvcrt.spec
+1
-1
No files found.
dlls/msvcrt/data.c
View file @
a88f03e2
...
...
@@ -50,7 +50,7 @@ char **MSVCRT___argv;
MSVCRT_wchar_t
**
MSVCRT___wargv
;
char
*
MSVCRT__acmdln
;
MSVCRT_wchar_t
*
MSVCRT__wcmdln
;
char
**
_environ
=
0
;
char
**
MSVCRT_
_environ
=
0
;
MSVCRT_wchar_t
**
_wenviron
=
0
;
char
**
MSVCRT___initenv
=
0
;
MSVCRT_wchar_t
**
MSVCRT___winitenv
=
0
;
...
...
@@ -203,9 +203,9 @@ MSVCRT_wchar_t*** CDECL __p___wargv(void) { return &MSVCRT___wargv; }
*/
char
***
CDECL
__p__environ
(
void
)
{
if
(
!
_environ
)
_environ
=
msvcrt_SnapshotOfEnvironmentA
(
NULL
);
return
&
_environ
;
if
(
!
MSVCRT_
_environ
)
MSVCRT_
_environ
=
msvcrt_SnapshotOfEnvironmentA
(
NULL
);
return
&
MSVCRT_
_environ
;
}
/*********************************************************************
...
...
@@ -302,7 +302,7 @@ void msvcrt_free_args(void)
/* FIXME: more things to free */
HeapFree
(
GetProcessHeap
(),
0
,
MSVCRT___initenv
);
HeapFree
(
GetProcessHeap
(),
0
,
MSVCRT___winitenv
);
HeapFree
(
GetProcessHeap
(),
0
,
_environ
);
HeapFree
(
GetProcessHeap
(),
0
,
MSVCRT_
_environ
);
HeapFree
(
GetProcessHeap
(),
0
,
_wenviron
);
HeapFree
(
GetProcessHeap
(),
0
,
MSVCRT__pgmptr
);
HeapFree
(
GetProcessHeap
(),
0
,
MSVCRT__wpgmptr
);
...
...
dlls/msvcrt/environ.c
View file @
a88f03e2
...
...
@@ -105,8 +105,8 @@ int CDECL _putenv(const char *str)
if
((
ret
==
-
1
)
&&
(
GetLastError
()
==
ERROR_ENVVAR_NOT_FOUND
))
ret
=
0
;
/* Update the __p__environ array only when already initialized */
if
(
_environ
)
_environ
=
msvcrt_SnapshotOfEnvironmentA
(
_environ
);
if
(
MSVCRT_
_environ
)
MSVCRT__environ
=
msvcrt_SnapshotOfEnvironmentA
(
MSVCRT_
_environ
);
if
(
_wenviron
)
_wenviron
=
msvcrt_SnapshotOfEnvironmentW
(
_wenviron
);
...
...
@@ -151,8 +151,8 @@ int CDECL _wputenv(const MSVCRT_wchar_t *str)
if
((
ret
==
-
1
)
&&
(
GetLastError
()
==
ERROR_ENVVAR_NOT_FOUND
))
ret
=
0
;
/* Update the __p__environ array only when already initialized */
if
(
_environ
)
_environ
=
msvcrt_SnapshotOfEnvironmentA
(
_environ
);
if
(
MSVCRT_
_environ
)
MSVCRT__environ
=
msvcrt_SnapshotOfEnvironmentA
(
MSVCRT_
_environ
);
if
(
_wenviron
)
_wenviron
=
msvcrt_SnapshotOfEnvironmentW
(
_wenviron
);
...
...
dlls/msvcrt/msvcrt.h
View file @
a88f03e2
...
...
@@ -119,7 +119,7 @@ void msvcrt_set_errno(int);
void
_purecall
(
void
);
void
_amsg_exit
(
int
errnum
);
extern
char
**
_environ
;
extern
char
**
MSVCRT_
_environ
;
extern
MSVCRT_wchar_t
**
_wenviron
;
extern
char
**
msvcrt_SnapshotOfEnvironmentA
(
char
**
);
...
...
dlls/msvcrt/msvcrt.spec
View file @
a88f03e2
...
...
@@ -208,7 +208,7 @@
@ cdecl _ecvt(double long ptr ptr)
@ cdecl _endthread ()
@ cdecl _endthreadex(long)
@ extern _environ
@ extern _environ
MSVCRT__environ
@ cdecl _eof(long)
@ cdecl _errno() MSVCRT__errno
@ cdecl _except_handler2(ptr ptr ptr ptr)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment