diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2013-04-23 13:44:36 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2013-04-23 13:44:36 +0400 |
| commit | 61522196c71593da09572fce9af9e0d7dad61bc3 (patch) | |
| tree | 9bf74facd67974fa2f780d6ce68b14eb7a94e371 /winsup/cygwin/environ.cc | |
| parent | 1875ee55d31d3673059373c8f9837bf98f93c713 (diff) | |
* Merge in cygwin-64bit-branch.
Diffstat (limited to 'winsup/cygwin/environ.cc')
| -rw-r--r-- | winsup/cygwin/environ.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc index 0d9e42e0f..a510e50d5 100644 --- a/winsup/cygwin/environ.cc +++ b/winsup/cygwin/environ.cc @@ -187,7 +187,7 @@ parse_options (const char *inbuf) *k->setting.x = k->values[istrue].i; else *k->setting.x = strtol (eq, NULL, 0); - debug_printf ("%s %d", k->name, *k->setting.x); + debug_printf ("%s %u", k->name, *k->setting.x); break; case setbool: if (!istrue || !eq) @@ -1048,7 +1048,7 @@ build_env (const char * const *envp, PWCHAR &envblock, int &envc, else { *pass_dstp = NULL; - debug_printf ("env count %d, bytes %d", pass_envc, tl); + debug_printf ("env count %ld, bytes %d", pass_envc, tl); win_env temp; temp.reset (); @@ -1118,6 +1118,7 @@ build_env (const char * const *envp, PWCHAR &envblock, int &envc, return newenv; } +#ifndef __x86_64__ /* This idiocy is necessary because the early implementers of cygwin did not seem to know about importing data variables from the DLL. So, we have to synchronize cygwin's idea of the environment with the @@ -1133,3 +1134,4 @@ cur_environ () return __cygwin_environ; } +#endif |