diff options
| author | Pierre Humblet <phumblet@phumblet.no-ip.org> | 2003-09-25 08:03:53 +0400 |
|---|---|---|
| committer | Pierre Humblet <phumblet@phumblet.no-ip.org> | 2003-09-25 08:03:53 +0400 |
| commit | 64150cfc6afa0339f2ec10466ba8122d996ec099 (patch) | |
| tree | 92e3a58f5482841a1e075659fea79ea6b9a5a6a5 /winsup/cygwin | |
| parent | cd2bce7142ff77e1e55149e5edfe04167b4e8964 (diff) | |
2003-09-25 Pierre Humblet <pierre.humblet@ieee.org>
* shared_info.h: Update CURR_USER_MAGIC, CURR_SHARED_MAGIC and
SHARED_INFO_CB.
(mount_info::cb): Delete.
(mount_info::version): Delete.
(shared_info::delqueue): Delete.
* Makefile.in: Do magic for USER_MAGIC, class user_info, instead
of for mount_info.
Diffstat (limited to 'winsup/cygwin')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 10 | ||||
| -rw-r--r-- | winsup/cygwin/Makefile.in | 2 | ||||
| -rw-r--r-- | winsup/cygwin/shared_info.h | 11 |
3 files changed, 15 insertions, 8 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index bc23adaf8..b1d4211de 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,13 @@ +2003-09-25 Pierre Humblet <pierre.humblet@ieee.org> + + * shared_info.h: Update CURR_USER_MAGIC, CURR_SHARED_MAGIC and + SHARED_INFO_CB. + (mount_info::cb): Delete. + (mount_info::version): Delete. + (shared_info::delqueue): Delete. + * Makefile.in: Do magic for USER_MAGIC, class user_info, instead + of for mount_info. + 2003-09-24 Christopher Faylor <cgf@redhat.com> * include/tzfile.h: Add some missing entries. diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index 951f2e86f..672bc7518 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -377,7 +377,7 @@ version.cc winver.o: winver_stamp @ : shared_info_magic.h: cygmagic shared_info.h - /bin/sh ${word 1,$^} $@ "$(CC) -x c" ${word 2,$^} MOUNT_MAGIC 'class mount_info' SHARED_MAGIC 'class shared_info' + /bin/sh ${word 1,$^} $@ "$(CC) -x c" ${word 2,$^} USER_MAGIC 'class user_info' SHARED_MAGIC 'class shared_info' child_info_magic.h: cygmagic child_info.h /bin/sh ${word 1,$^} $@ "$(CC) -x c" ${word 2,$^} CHILD_INFO_MAGIC 'class child_info' diff --git a/winsup/cygwin/shared_info.h b/winsup/cygwin/shared_info.h index dadab8993..fd197bd57 100644 --- a/winsup/cygwin/shared_info.h +++ b/winsup/cygwin/shared_info.h @@ -43,8 +43,8 @@ class mount_item #define MAX_MOUNTS 30 #define USER_VERSION 1 // increment when mount table changes and -#define USER_VERSION_MAGIC CYGWIN_VERSION_MAGIC (MOUNT_MAGIC, USER_VERSION) -#define CURR_MOUNT_MAGIC 0x6dd73a3fU +#define USER_VERSION_MAGIC CYGWIN_VERSION_MAGIC (USER_MAGIC, USER_VERSION) +#define CURR_USER_MAGIC 0x8dc7b1d5U class reg_key; struct device; @@ -55,8 +55,6 @@ struct device; class mount_info { public: - DWORD version; - unsigned cb; DWORD sys_mount_table_counter; int nmounts; mount_item mount[MAX_MOUNTS]; @@ -147,9 +145,9 @@ public: cygwin_version.api_minor) #define SHARED_VERSION_MAGIC CYGWIN_VERSION_MAGIC (SHARED_MAGIC, SHARED_VERSION) -#define SHARED_INFO_CB 47112 +#define SHARED_INFO_CB 21008 -#define CURR_SHARED_MAGIC 0x359218a2U +#define CURR_SHARED_MAGIC 0x818f75beU /* NOTE: Do not make gratuitous changes to the names or organization of the below class. The layout is checksummed to determine compatibility between @@ -163,7 +161,6 @@ class shared_info DWORD sys_mount_table_counter; tty_list tty; - delqueue_list delqueue; void initialize (); unsigned heap_chunk_size (); }; |