diff options
Diffstat (limited to 'winsup/cygwin/external.cc')
| -rw-r--r-- | winsup/cygwin/external.cc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/winsup/cygwin/external.cc b/winsup/cygwin/external.cc index 8734deed3..4dc87bf80 100644 --- a/winsup/cygwin/external.cc +++ b/winsup/cygwin/external.cc @@ -113,7 +113,7 @@ fillout_pinfo (pid_t pid, int winpid) return &ep; } -static inline DWORD +static inline uintptr_t get_cygdrive_info (char *user, char *system, char *user_flags, char *system_flags) { @@ -122,7 +122,7 @@ get_cygdrive_info (char *user, char *system, char *user_flags, return (res == ERROR_SUCCESS) ? 1 : 0; } -static DWORD +static bool check_ntsec (const char *filename) { if (!filename) @@ -200,7 +200,7 @@ exit_process (UINT status, bool useTerminateProcess) } -extern "C" unsigned long +extern "C" uintptr_t cygwin_internal (cygwin_getinfo_types t, ...) { va_list arg; @@ -218,7 +218,7 @@ cygwin_internal (cygwin_getinfo_types t, ...) break; case CW_GETTHREADNAME: - res = (DWORD) cygthread::name (va_arg (arg, DWORD)); + res = (uintptr_t) cygthread::name (va_arg (arg, DWORD)); break; case CW_SETTHREADNAME: @@ -229,11 +229,11 @@ cygwin_internal (cygwin_getinfo_types t, ...) break; case CW_GETPINFO: - res = (DWORD) fillout_pinfo (va_arg (arg, DWORD), 0); + res = (uintptr_t) fillout_pinfo (va_arg (arg, DWORD), 0); break; case CW_GETVERSIONINFO: - res = (DWORD) cygwin_version_strings; + res = (uintptr_t) cygwin_version_strings; break; case CW_READ_V1_MOUNT_TABLES: @@ -247,7 +247,7 @@ cygwin_internal (cygwin_getinfo_types t, ...) Hilarity ensues if the DLL is not loaded like while the process is forking. */ __cygwin_user_data.cxx_malloc = &default_cygwin_cxx_malloc; - res = (DWORD) &__cygwin_user_data; + res = (uintptr_t) &__cygwin_user_data; break; case CW_PERFILE: @@ -264,7 +264,7 @@ cygwin_internal (cygwin_getinfo_types t, ...) break; case CW_GETPINFO_FULL: - res = (DWORD) fillout_pinfo (va_arg (arg, pid_t), 1); + res = (uintptr_t) fillout_pinfo (va_arg (arg, pid_t), 1); break; case CW_INIT_EXCEPTIONS: @@ -299,7 +299,7 @@ cygwin_internal (cygwin_getinfo_types t, ...) else { set_errno (ESRCH); - res = (DWORD) -1; + res = (uintptr_t) -1; } } break; @@ -337,7 +337,7 @@ cygwin_internal (cygwin_getinfo_types t, ...) size_t n; pid_t pid = va_arg (arg, pid_t); pinfo p (pid); - res = (DWORD) p->cmdline (n); + res = (uintptr_t) p->cmdline (n); } break; case CW_CHECK_NTSEC: @@ -406,24 +406,24 @@ cygwin_internal (cygwin_getinfo_types t, ...) const char *name = va_arg (arg, const char *); const void *hookfn = va_arg (arg, const void *); WORD subsys; - res = (unsigned long) hook_or_detect_cygwin (name, hookfn, subsys); + res = (uintptr_t) hook_or_detect_cygwin (name, hookfn, subsys); } break; case CW_ARGV: { child_info_spawn *ci = (child_info_spawn *) get_cygwin_startup_info (); - res = (unsigned long) (ci ? ci->moreinfo->argv : NULL); + res = (uintptr_t) (ci ? ci->moreinfo->argv : NULL); } break; case CW_ENVP: { child_info_spawn *ci = (child_info_spawn *) get_cygwin_startup_info (); - res = (unsigned long) (ci ? ci->moreinfo->envp : NULL); + res = (uintptr_t) (ci ? ci->moreinfo->envp : NULL); } break; case CW_DEBUG_SELF: error_start_init (va_arg (arg, const char *)); - try_to_debug (); + res = try_to_debug (); break; case CW_SYNC_WINENV: create_winenv (NULL); |