diff options
| author | Paul Eggert | 2011-03-16 19:36:27 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-03-16 19:36:27 -0700 |
| commit | 57048744037204ae0cef40cdca9d8a967a4e1407 (patch) | |
| tree | b69ab81e4eb48a4f95d911e9ae8a25f7da38a8dd /src | |
| parent | 615f2d59a5ee849bc46c3fa57d41fd136f2d0962 (diff) | |
| download | emacs-57048744037204ae0cef40cdca9d8a967a4e1407.tar.gz emacs-57048744037204ae0cef40cdca9d8a967a4e1407.zip | |
* s/irix6-5.h (PTY_OPEN): Declare stb, to loosen coupling.
* process.c (allocate_pty): Don't declare stb unless it's needed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/process.c | 2 | ||||
| -rw-r--r-- | src/s/irix6-5.h | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fa08263a80a..45cb41024ae 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2011-03-17 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-03-17 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * s/irix6-5.h (PTY_OPEN): Declare stb, to loosen coupling. | ||
| 4 | * process.c (allocate_pty): Don't declare stb unless it's needed. | ||
| 5 | |||
| 3 | * bytecode.c (MAYBE_GC): Rewrite so as not to use empty "else". | 6 | * bytecode.c (MAYBE_GC): Rewrite so as not to use empty "else". |
| 4 | (CONSTANTLIM): Remove; unused. | 7 | (CONSTANTLIM): Remove; unused. |
| 5 | (METER_CODE, Bscan_buffer, Bread_char, Bset_mark): | 8 | (METER_CODE, Bscan_buffer, Bread_char, Bset_mark): |
diff --git a/src/process.c b/src/process.c index 39fa26e8b54..a026174bd23 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -545,7 +545,6 @@ allocate_pty (void) | |||
| 545 | for (i = 0; i < 16; i++) | 545 | for (i = 0; i < 16; i++) |
| 546 | #endif | 546 | #endif |
| 547 | { | 547 | { |
| 548 | struct stat stb; /* Used in some PTY_OPEN. */ | ||
| 549 | #ifdef PTY_NAME_SPRINTF | 548 | #ifdef PTY_NAME_SPRINTF |
| 550 | PTY_NAME_SPRINTF | 549 | PTY_NAME_SPRINTF |
| 551 | #else | 550 | #else |
| @@ -562,6 +561,7 @@ allocate_pty (void) | |||
| 562 | three failures in a row before deciding that we've reached the | 561 | three failures in a row before deciding that we've reached the |
| 563 | end of the ptys. */ | 562 | end of the ptys. */ |
| 564 | int failed_count = 0; | 563 | int failed_count = 0; |
| 564 | struct stat stb; | ||
| 565 | 565 | ||
| 566 | if (stat (pty_name, &stb) < 0) | 566 | if (stat (pty_name, &stb) < 0) |
| 567 | { | 567 | { |
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h index 92465ded2ef..d283571d8fb 100644 --- a/src/s/irix6-5.h +++ b/src/s/irix6-5.h | |||
| @@ -60,6 +60,7 @@ char *_getpty(); | |||
| 60 | #define PTY_OPEN \ | 60 | #define PTY_OPEN \ |
| 61 | { \ | 61 | { \ |
| 62 | struct sigaction ocstat, cstat; \ | 62 | struct sigaction ocstat, cstat; \ |
| 63 | struct stat stb; \ | ||
| 63 | char * name; \ | 64 | char * name; \ |
| 64 | sigemptyset(&cstat.sa_mask); \ | 65 | sigemptyset(&cstat.sa_mask); \ |
| 65 | cstat.sa_handler = SIG_DFL; \ | 66 | cstat.sa_handler = SIG_DFL; \ |
| @@ -95,5 +96,3 @@ char *_getpty(); | |||
| 95 | /* Tested on Irix 6.5. SCM worked on earlier versions. */ | 96 | /* Tested on Irix 6.5. SCM worked on earlier versions. */ |
| 96 | #define GC_SETJMP_WORKS 1 | 97 | #define GC_SETJMP_WORKS 1 |
| 97 | #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS | 98 | #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS |
| 98 | |||
| 99 | |||