diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2013-04-23 09:44:36 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2013-04-23 09:44:36 +0000 |
| commit | 61522196c71593da09572fce9af9e0d7dad61bc3 (patch) | |
| tree | 9bf74facd67974fa2f780d6ce68b14eb7a94e371 /winsup/cygwin/child_info.h | |
| parent | 1875ee55d31d3673059373c8f9837bf98f93c713 (diff) | |
| download | newlib-61522196c71593da09572fce9af9e0d7dad61bc3.zip newlib-61522196c71593da09572fce9af9e0d7dad61bc3.tar.gz newlib-61522196c71593da09572fce9af9e0d7dad61bc3.tar.bz2 | |
* Merge in cygwin-64bit-branch.
Diffstat (limited to 'winsup/cygwin/child_info.h')
| -rw-r--r-- | winsup/cygwin/child_info.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/winsup/cygwin/child_info.h b/winsup/cygwin/child_info.h index 17da88e..70cfd54 100644 --- a/winsup/cygwin/child_info.h +++ b/winsup/cygwin/child_info.h @@ -35,7 +35,7 @@ enum child_status #define EXEC_MAGIC_SIZE sizeof(child_info) /* Change this value if you get a message indicating that it is out-of-sync. */ -#define CURR_CHILD_INFO_MAGIC 0xe399543U +#define CURR_CHILD_INFO_MAGIC 0x93737edaU #define NPROCS 256 @@ -55,7 +55,7 @@ public: DWORD msv_count; // zeroed on < W2K3, set to pseudo-count on Vista DWORD cb; // size of this record DWORD intro; // improbable string - unsigned long magic; // magic number unique to child_info + DWORD magic; // magic number unique to child_info unsigned short type; // type of record, exec, spawn, fork init_cygheap *cygheap; void *cygheap_max; @@ -190,6 +190,6 @@ void __stdcall init_child_info (DWORD, child_info *, HANDLE); extern "C" { extern child_info *child_proc_info; -extern child_info_spawn *spawn_info asm ("_child_proc_info"); -extern child_info_fork *fork_info asm ("_child_proc_info"); +extern child_info_spawn *spawn_info asm (_SYMSTR (child_proc_info)); +extern child_info_fork *fork_info asm (_SYMSTR (child_proc_info)); } |