diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-30 12:00:39 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-30 12:00:39 -0700 |
| commit | be5b6b7d1814aa7067232f55baf7c34d69ae3c92 (patch) | |
| tree | b41cf6e840675dd51caafc84738c6e06188957c8 /nt | |
| parent | a06d10b62255f115beee2b9a5aa6ffabce4c13dc (diff) | |
| parent | bbc9168121fc9b0b0ac3b9f1f13e1af67a77b65b (diff) | |
| download | emacs-be5b6b7d1814aa7067232f55baf7c34d69ae3c92.tar.gz | |
Merge from mainline.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 12 | ||||
| -rw-r--r-- | nt/config.nt | 15 |
2 files changed, 19 insertions, 8 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 541365787e9..7f00cbd062a 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,9 +1,13 @@ 2011-04-30 Paul Eggert <eggert@cs.ucla.edu> - * config.nt: Configure 64-bit integers. - (BITS_PER_LONG_LONG): Define if C99-style long long and "%lld" work. - (EMACS_INT, BITS_PER_EMACS_INT, pI): Otherwise, define these if - __int64 and "%I64d" work. + * config.nt: Configure 64-bit integers for older compilers. + (EMACS_INT, BITS_PER_EMACS_INT, pI): Define these if __int64 and + "%I64d" work but long long and "%lld" do not. + +2011-04-30 Eli Zaretskii <eliz@gnu.org> + + * config.nt (HAVE_LONG_LONG_INT, HAVE_UNSIGNED_LONG_LONG_INT): + Define to 1 for MinGW of MSVC versions >= 1400. 2011-04-28 Eli Zaretskii <eliz@gnu.org> diff --git a/nt/config.nt b/nt/config.nt index 7765919638f..b595e298996 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -470,14 +470,21 @@ extern char *getenv (); #define BITS_PER_LONG 32 #endif -#if defined __MINGW32__ || 1400 <= _MSC_VER -/* C99-style long long and "%lld" both work, so use them. */ -# define BITS_PER_LONG_LONG 64 -#elif 1200 <= _MSC_VER +#if defined(__MINGW32__) || _MSC_VER >= 1400 + +/* Define to 1 if the system has the type `long long int'. */ +# define HAVE_LONG_LONG_INT 1 + +/* Define to 1 if the system has the type `unsigned long long int'. */ +# define HAVE_UNSIGNED_LONG_LONG_INT 1 + +#elif _MSC_VER >= 1200 + /* Use pre-C99-style 64-bit integers. */ # define EMACS_INT __int64 # define BITS_PER_EMACS_INT 64 # define pI "I64" + #endif #ifndef POINTER_TYPE |