diff options
| author | Paul Eggert | 2011-06-14 13:09:52 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-14 13:09:52 -0700 |
| commit | 4a2f0ad6c1725a6858c3f02add438e8323bb4c7d (patch) | |
| tree | 304af7c10fbbdef679242c3152082ca5b50f0af0 /src | |
| parent | e8f2a944716884ba72b9ef3a49db2d5bca428ac9 (diff) | |
| download | emacs-4a2f0ad6c1725a6858c3f02add438e8323bb4c7d.tar.gz emacs-4a2f0ad6c1725a6858c3f02add438e8323bb4c7d.zip | |
* eval.c, doprnt.c (SIZE_MAX): Remove; inttypes.h defines this now.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/doprnt.c | 4 | ||||
| -rw-r--r-- | src/eval.c | 4 |
3 files changed, 4 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index dc8f983c870..275d7e08a76 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,11 +1,13 @@ | |||
| 1 | 2011-06-14 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-06-14 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * eval.c, doprnt.c (SIZE_MAX): Remove; inttypes.h defines this now. | ||
| 4 | |||
| 3 | Variadic C functions now count arguments with ptrdiff_t. | 5 | Variadic C functions now count arguments with ptrdiff_t. |
| 4 | This partly undoes my 2011-03-30 change, which replaced int with size_t. | 6 | This partly undoes my 2011-03-30 change, which replaced int with size_t. |
| 5 | Back then I didn't know that the Emacs coding style prefers signed int. | 7 | Back then I didn't know that the Emacs coding style prefers signed int. |
| 6 | Also, in the meantime I found a few more instances where arguments | 8 | Also, in the meantime I found a few more instances where arguments |
| 7 | were being counted with int, which may be too narrow, or EMACS_INT, which | 9 | were being counted with int, which may truncate counts on 64-bit |
| 8 | may be too wide. | 10 | machines, or EMACS_INT, which may be unnecessarily wide. |
| 9 | * lisp.h (struct Lisp_Subr.function.aMANY) | 11 | * lisp.h (struct Lisp_Subr.function.aMANY) |
| 10 | (DEFUN_ARGS_MANY, internal_condition_case_n, safe_call): | 12 | (DEFUN_ARGS_MANY, internal_condition_case_n, safe_call): |
| 11 | Arg counts are now ptrdiff_t, not size_t. | 13 | Arg counts are now ptrdiff_t, not size_t. |
diff --git a/src/doprnt.c b/src/doprnt.c index f5e31153628..195598c07ea 100644 --- a/src/doprnt.c +++ b/src/doprnt.c | |||
| @@ -118,10 +118,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 118 | another macro. */ | 118 | another macro. */ |
| 119 | #include "character.h" | 119 | #include "character.h" |
| 120 | 120 | ||
| 121 | #ifndef SIZE_MAX | ||
| 122 | # define SIZE_MAX ((size_t) -1) | ||
| 123 | #endif | ||
| 124 | |||
| 125 | #ifndef DBL_MAX_10_EXP | 121 | #ifndef DBL_MAX_10_EXP |
| 126 | #define DBL_MAX_10_EXP 308 /* IEEE double */ | 122 | #define DBL_MAX_10_EXP 308 /* IEEE double */ |
| 127 | #endif | 123 | #endif |
diff --git a/src/eval.c b/src/eval.c index 65cd87cd8ed..eff50a4de52 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -32,10 +32,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 32 | #include "xterm.h" | 32 | #include "xterm.h" |
| 33 | #endif | 33 | #endif |
| 34 | 34 | ||
| 35 | #ifndef SIZE_MAX | ||
| 36 | # define SIZE_MAX ((size_t) -1) | ||
| 37 | #endif | ||
| 38 | |||
| 39 | /* This definition is duplicated in alloc.c and keyboard.c. */ | 35 | /* This definition is duplicated in alloc.c and keyboard.c. */ |
| 40 | /* Putting it in lisp.h makes cc bomb out! */ | 36 | /* Putting it in lisp.h makes cc bomb out! */ |
| 41 | 37 | ||