diff options
| author | Dan Nicolaescu | 2010-10-10 06:44:22 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-10-10 06:44:22 -0700 |
| commit | 4c62015720b45e78ed358a369626339ac34d4fbc (patch) | |
| tree | 4660eed17401a72ab270bf8642d19bbc96ca45b6 /src | |
| parent | c332ebc2aba26b1734ada799a1cafb779b8e526b (diff) | |
| download | emacs-4c62015720b45e78ed358a369626339ac34d4fbc.tar.gz emacs-4c62015720b45e78ed358a369626339ac34d4fbc.zip | |
Small sysdep.c cleanups.
* src/sysdep.c (LPASS8): Remove, unused.
(emacs_ospeed): Change from being a global to a local in the only
user: init_baud_rate.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/sysdep.c | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f2e6297ae22..78f28189ffe 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2010-10-10 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * sysdep.c (LPASS8): Remove, unused. | ||
| 4 | (emacs_ospeed): Change from being a global to a local in the only | ||
| 5 | user: init_baud_rate. | ||
| 6 | |||
| 1 | 2010-10-09 Lars Magne Ingebrigtsen <larsi@gnus.org> | 7 | 2010-10-09 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 8 | ||
| 3 | * gnutls.c (syms_of_gnutls): All the bootprops are keywords. | 9 | * gnutls.c (syms_of_gnutls): All the bootprops are keywords. |
diff --git a/src/sysdep.c b/src/sysdep.c index f46a9e614b9..f68d475d22c 100644 --- a/src/sysdep.c +++ b/src/sysdep.c | |||
| @@ -123,19 +123,12 @@ struct utimbuf { | |||
| 123 | #endif | 123 | #endif |
| 124 | #endif | 124 | #endif |
| 125 | 125 | ||
| 126 | /* LPASS8 is new in 4.3, and makes cbreak mode provide all 8 bits. */ | ||
| 127 | #ifndef LPASS8 | ||
| 128 | #define LPASS8 0 | ||
| 129 | #endif | ||
| 130 | |||
| 131 | static const int baud_convert[] = | 126 | static const int baud_convert[] = |
| 132 | { | 127 | { |
| 133 | 0, 50, 75, 110, 135, 150, 200, 300, 600, 1200, | 128 | 0, 50, 75, 110, 135, 150, 200, 300, 600, 1200, |
| 134 | 1800, 2400, 4800, 9600, 19200, 38400 | 129 | 1800, 2400, 4800, 9600, 19200, 38400 |
| 135 | }; | 130 | }; |
| 136 | 131 | ||
| 137 | int emacs_ospeed; | ||
| 138 | |||
| 139 | void croak (char *) NO_RETURN; | 132 | void croak (char *) NO_RETURN; |
| 140 | 133 | ||
| 141 | /* Temporary used by `sigblock' when defined in terms of signprocmask. */ | 134 | /* Temporary used by `sigblock' when defined in terms of signprocmask. */ |
| @@ -275,6 +268,8 @@ stuff_char (char c) | |||
| 275 | void | 268 | void |
| 276 | init_baud_rate (int fd) | 269 | init_baud_rate (int fd) |
| 277 | { | 270 | { |
| 271 | int emacs_ospeed; | ||
| 272 | |||
| 278 | if (noninteractive) | 273 | if (noninteractive) |
| 279 | emacs_ospeed = 0; | 274 | emacs_ospeed = 0; |
| 280 | else | 275 | else |