diff options
| author | Paul Eggert | 2012-05-25 11:19:24 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-05-25 11:19:24 -0700 |
| commit | 42b2a986d9d4b7040fb20c90ec0efeffb78e761a (patch) | |
| tree | d38e7bf5307837f2f38982757f088100de18a64e /src/tparam.c | |
| parent | e4d81efc58695c19154d5f6733d91172b4c3e5b7 (diff) | |
| parent | a8d3cbf75d219d7a249fc0623219511179e959da (diff) | |
| download | emacs-42b2a986d9d4b7040fb20c90ec0efeffb78e761a.tar.gz emacs-42b2a986d9d4b7040fb20c90ec0efeffb78e761a.zip | |
Merge from trunk.
Diffstat (limited to 'src/tparam.c')
| -rw-r--r-- | src/tparam.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/tparam.c b/src/tparam.c index ac21667d65b..4d26ef524fb 100644 --- a/src/tparam.c +++ b/src/tparam.c | |||
| @@ -22,10 +22,6 @@ Boston, MA 02110-1301, USA. */ | |||
| 22 | #include <setjmp.h> | 22 | #include <setjmp.h> |
| 23 | #include "lisp.h" /* for xmalloc */ | 23 | #include "lisp.h" /* for xmalloc */ |
| 24 | #include "tparam.h" | 24 | #include "tparam.h" |
| 25 | |||
| 26 | #ifndef NULL | ||
| 27 | #define NULL (char *) 0 | ||
| 28 | #endif | ||
| 29 | 25 | ||
| 30 | /* Assuming STRING is the value of a termcap string entry | 26 | /* Assuming STRING is the value of a termcap string entry |
| 31 | containing `%' constructs to expand parameters, | 27 | containing `%' constructs to expand parameters, |