diff options
| author | Stefan Monnier | 2011-03-21 12:42:16 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2011-03-21 12:42:16 -0400 |
| commit | cafdcef32d55cbb44389d7e322e7f973cbb72dfd (patch) | |
| tree | 7ee0c41ea8a589650ce6f4311fb10e61a63807b9 /src/s/darwin.h | |
| parent | a08a25d7aaf251aa18f2ef747be53734bc55cae9 (diff) | |
| parent | 4e05e67e4cd0bc1b0a4ef3176a4d0d91c6b3738e (diff) | |
| download | emacs-cafdcef32d55cbb44389d7e322e7f973cbb72dfd.tar.gz emacs-cafdcef32d55cbb44389d7e322e7f973cbb72dfd.zip | |
Merge from trunk
Diffstat (limited to 'src/s/darwin.h')
| -rw-r--r-- | src/s/darwin.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/s/darwin.h b/src/s/darwin.h index 4fc2f4d1031..dd0d0c34021 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h | |||
| @@ -68,7 +68,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 68 | Note: PTYs are broken on darwin <6. Use at your own risk. */ | 68 | Note: PTYs are broken on darwin <6. Use at your own risk. */ |
| 69 | #define HAVE_PTYS | 69 | #define HAVE_PTYS |
| 70 | /* Run only once. We need a `for'-loop because the code uses `continue'. */ | 70 | /* Run only once. We need a `for'-loop because the code uses `continue'. */ |
| 71 | #define PTY_ITERATION for (i = 0; i < 1; i++) | 71 | #define PTY_ITERATION int i; for (i = 0; i < 1; i++) |
| 72 | #define PTY_NAME_SPRINTF /* none */ | 72 | #define PTY_NAME_SPRINTF /* none */ |
| 73 | #define PTY_TTY_NAME_SPRINTF /* none */ | 73 | #define PTY_TTY_NAME_SPRINTF /* none */ |
| 74 | /* Note that openpty may fork via grantpt on Mac OS X 10.4/Darwin 8. | 74 | /* Note that openpty may fork via grantpt on Mac OS X 10.4/Darwin 8. |
| @@ -148,4 +148,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 148 | 148 | ||
| 149 | /* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack. */ | 149 | /* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack. */ |
| 150 | #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS | 150 | #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS |
| 151 | |||