diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2003-03-19 23:13:57 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2003-03-19 23:13:57 +0300 |
| commit | c16d09466bcdfd94ee3566ed8c6e662ffd084ffd (patch) | |
| tree | 889763e24d0cd68e51c0ed94e7afbdd76cb7b48a /winsup | |
| parent | e65d559e712d408af563eb1b87423801a9e297ec (diff) | |
* include/cygwin/version.h (CYGWIN_VERSION_CHECK_FOR_USING_BIG_TYPES):
Define.
* glob.c (g_lstat): Use CYGWIN_VERSION_CHECK_FOR_USING_BIG_TYPES
instead of numerical constants.
(g_stat): Ditto.
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/cygwin/glob.c | 5 | ||||
| -rw-r--r-- | winsup/cygwin/include/cygwin/version.h | 4 |
3 files changed, 15 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 812653538..994e9c58f 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,11 @@ +2003-03-19 Corinna Vinschen <corinna@vinschen.de> + + * include/cygwin/version.h (CYGWIN_VERSION_CHECK_FOR_USING_BIG_TYPES): + Define. + * glob.c (g_lstat): Use CYGWIN_VERSION_CHECK_FOR_USING_BIG_TYPES + instead of numerical constants. + (g_stat): Ditto. + 2003-03-18 Thomas Pfaff <tpfaff@gmx.net> * pthread.cc (pthread_attr_init): Remove diff --git a/winsup/cygwin/glob.c b/winsup/cygwin/glob.c index c74a7812c..37e0317a6 100644 --- a/winsup/cygwin/glob.c +++ b/winsup/cygwin/glob.c @@ -81,6 +81,7 @@ #include <windows.h> #include "perprocess.h" +#include "cygwin/version.h" #ifdef __weak_alias #ifdef __LIBC12_SOURCE__ @@ -840,7 +841,7 @@ g_lstat(fn, sb, pglob) struct __stat32 lsb; int ret; - if (user_data->api_major > 0 || user_data->api_minor > 78) + if (CYGWIN_VERSION_CHECK_FOR_USING_BIG_TYPES) ret = (*pglob->gl_lstat)(buf, &sb); else if (!(ret = (*pglob->gl_lstat)(buf, &lsb))) stat32_to_STAT (&lsb, sb); @@ -866,7 +867,7 @@ g_stat(fn, sb, pglob) struct __stat32 lsb; int ret; - if (user_data->api_major > 0 || user_data->api_minor > 78) + if (CYGWIN_VERSION_CHECK_FOR_USING_BIG_TYPES) ret = (*pglob->gl_stat)(buf, &sb); if (!(ret = (*pglob->gl_stat)(buf, &lsb))) stat32_to_STAT (&lsb, sb); diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h index 60cfd10b4..6ca91004a 100644 --- a/winsup/cygwin/include/cygwin/version.h +++ b/winsup/cygwin/include/cygwin/version.h @@ -84,6 +84,10 @@ details. */ #define CYGWIN_VERSION_CHECK_FOR_OLD_O_NONBLOCK \ (CYGWIN_VERSION_DLL_MAKE_COMBINED (user_data->api_major, user_data->api_minor) <= \ 28) + +#define CYGWIN_VERSION_CHECK_FOR_USING_BIG_TYPES \ + (CYGWIN_VERSION_DLL_MAKE_COMBINED (user_data->api_major, user_data->api_minor) >= \ + 79) /* We used to use the DLL major/minor to track non-backward-compatible interface changes to the API. Now we use an API major/minor number for this purpose. */ |