diff options
| author | Matthew Carter | 2016-01-30 22:09:28 -0500 |
|---|---|---|
| committer | Matthew Carter | 2016-01-30 22:09:28 -0500 |
| commit | 4699c325be1fa5daa258719a935f40b36664fcf2 (patch) | |
| tree | 3d88dfd9a52485ae7bc37dfffc34ee6655d446ce /src | |
| parent | 440a35f6b5770596981189ad65eaa5750b901908 (diff) | |
| parent | bdfee01a6567b9f08f82bc84d1196e6cb62587ca (diff) | |
| download | emacs-4699c325be1fa5daa258719a935f40b36664fcf2.tar.gz emacs-4699c325be1fa5daa258719a935f40b36664fcf2.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src')
| -rw-r--r-- | src/lastfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lastfile.c b/src/lastfile.c index 9c73fb44700..de4e4f45362 100644 --- a/src/lastfile.c +++ b/src/lastfile.c | |||
| @@ -38,8 +38,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 38 | 38 | ||
| 39 | #include "lisp.h" | 39 | #include "lisp.h" |
| 40 | 40 | ||
| 41 | #if ((!defined SYSTEM_MALLOC && !defined HYBRID_MALLOC && !defined WINDOWSNT) \ | 41 | #if ((!defined SYSTEM_MALLOC && !defined HYBRID_MALLOC) \ |
| 42 | || defined CYGWIN || defined DARWIN_OS) | 42 | || defined WINDOWSNT || defined CYGWIN || defined DARWIN_OS) |
| 43 | char my_edata[] = "End of Emacs initialized data"; | 43 | char my_edata[] = "End of Emacs initialized data"; |
| 44 | #endif | 44 | #endif |
| 45 | 45 | ||