From abe2834a4972c22f71e0a2d3ed336366a2526692 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 11 Jun 2008 09:43:59 +0000 Subject: [PATCH] * include/cygwin/version.h (CYGWIN_VERSION_MOUNT_REGISTRY): Bump. (CYGWIN_INFO_CYGWIN_MOUNT_REGISTRY_NAME): Remove. (CYGWIN_INFO_CYGDRIVE_FLAGS): Remove. (CYGWIN_INFO_CYGDRIVE_PREFIX): Remove. (CYGWIN_INFO_CYGDRIVE_DEFAULT_PREFIX): Add comment to differ from the registry related defines. --- winsup/cygwin/ChangeLog | 9 +++++++++ winsup/cygwin/include/cygwin/version.h | 9 +++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index ca36ae973..f9d05101d 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,12 @@ +2008-06-11 Corinna Vinschen + + * include/cygwin/version.h (CYGWIN_VERSION_MOUNT_REGISTRY): Bump. + (CYGWIN_INFO_CYGWIN_MOUNT_REGISTRY_NAME): Remove. + (CYGWIN_INFO_CYGDRIVE_FLAGS): Remove. + (CYGWIN_INFO_CYGDRIVE_PREFIX): Remove. + (CYGWIN_INFO_CYGDRIVE_DEFAULT_PREFIX): Add comment to differ from the + registry related defines. + 2008-06-11 Corinna Vinschen * fhandler_procnet.cc (dad_to_flags): Fix comment. diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h index 668c0636e..1abf43d12 100644 --- a/winsup/cygwin/include/cygwin/version.h +++ b/winsup/cygwin/include/cygwin/version.h @@ -363,17 +363,18 @@ details. */ 1: Original number version. 2: New mount registry layout, system-wide mount accessibility. + 3: The mount table is not in the registry anymore, but in /etc/fstab. */ -#define CYGWIN_VERSION_MOUNT_REGISTRY 2 +#define CYGWIN_VERSION_MOUNT_REGISTRY 3 /* Identifiers used in the Win32 registry. */ #define CYGWIN_INFO_CYGWIN_REGISTRY_NAME "Cygwin" #define CYGWIN_INFO_PROGRAM_OPTIONS_NAME "Program Options" -#define CYGWIN_INFO_CYGWIN_MOUNT_REGISTRY_NAME "mounts v2" -#define CYGWIN_INFO_CYGDRIVE_FLAGS "cygdrive flags" -#define CYGWIN_INFO_CYGDRIVE_PREFIX "cygdrive prefix" + + /* The default cygdrive prefix. */ + #define CYGWIN_INFO_CYGDRIVE_DEFAULT_PREFIX "/cygdrive" /* In addition to the above version number strings, the build