diff options
| author | Kenichi Handa | 2010-07-26 13:29:08 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2010-07-26 13:29:08 +0900 |
| commit | 50efd41b43c9b1b540c49c53d4e7824468ec7879 (patch) | |
| tree | 4a3be8d0322c537816f47a0c6450fc13495edf35 /src/lisp.h | |
| parent | dfe3c90fa5974e200483297e11bb889d0589b8f5 (diff) | |
| parent | 7d383292d10b876efec43e77fd51c2665e912688 (diff) | |
| download | emacs-50efd41b43c9b1b540c49c53d4e7824468ec7879.tar.gz emacs-50efd41b43c9b1b540c49c53d4e7824468ec7879.zip | |
merge trunk
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lisp.h b/src/lisp.h index d1a14fcd894..6b5de400c06 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -2393,7 +2393,6 @@ extern void swap_in_global_binding (struct Lisp_Symbol *); | |||
| 2393 | EXFUN (Fend_of_line, 1); | 2393 | EXFUN (Fend_of_line, 1); |
| 2394 | EXFUN (Fforward_char, 1); | 2394 | EXFUN (Fforward_char, 1); |
| 2395 | EXFUN (Fforward_line, 1); | 2395 | EXFUN (Fforward_line, 1); |
| 2396 | extern int internal_self_insert (int, int); | ||
| 2397 | extern void syms_of_cmds (void); | 2396 | extern void syms_of_cmds (void); |
| 2398 | extern void keys_of_cmds (void); | 2397 | extern void keys_of_cmds (void); |
| 2399 | 2398 | ||
| @@ -3400,16 +3399,16 @@ extern int emacs_close (int); | |||
| 3400 | extern int emacs_read (int, char *, unsigned int); | 3399 | extern int emacs_read (int, char *, unsigned int); |
| 3401 | extern int emacs_write (int, const char *, unsigned int); | 3400 | extern int emacs_write (int, const char *, unsigned int); |
| 3402 | #ifndef HAVE_MEMSET | 3401 | #ifndef HAVE_MEMSET |
| 3403 | extern void *memset P_ ((void *, int, size_t)); | 3402 | extern void *memset (void *, int, size_t); |
| 3404 | #endif | 3403 | #endif |
| 3405 | #ifndef HAVE_MEMCPY | 3404 | #ifndef HAVE_MEMCPY |
| 3406 | extern void *memcpy P_ ((void *, void *, size_t)); | 3405 | extern void *memcpy (void *, void *, size_t); |
| 3407 | #endif | 3406 | #endif |
| 3408 | #ifndef HAVE_MEMMOVE | 3407 | #ifndef HAVE_MEMMOVE |
| 3409 | extern void *memmove P_ ((void *, void *, size_t)); | 3408 | extern void *memmove (void *, void *, size_t); |
| 3410 | #endif | 3409 | #endif |
| 3411 | #ifndef HAVE_MEMCMP | 3410 | #ifndef HAVE_MEMCMP |
| 3412 | extern int memcmp P_ ((void *, void *, size_t)); | 3411 | extern int memcmp (void *, void *, size_t); |
| 3413 | #endif | 3412 | #endif |
| 3414 | 3413 | ||
| 3415 | /* Defined in filelock.c */ | 3414 | /* Defined in filelock.c */ |