diff options
| author | Glenn Morris | 2012-07-12 19:56:39 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-07-12 19:56:39 -0400 |
| commit | b82da769e5bd9aab6ee2102d4c98ed7e1c6541bb (patch) | |
| tree | b2ceffaf072612d2e1121a680c8f381148761646 /src/sysselect.h | |
| parent | ba9e4b84ac8322e84cd0cc1c5fe6d5d8a8453ff5 (diff) | |
| download | emacs-b82da769e5bd9aab6ee2102d4c98ed7e1c6541bb.tar.gz emacs-b82da769e5bd9aab6ee2102d4c98ed7e1c6541bb.zip | |
Rename init_process rather than working around it on Darwin
The old name is also the name of a Mach system call.
* src/process.c (init_process_emacs): Rename from init_process.
* src/lisp.h, src/emacs.c: Update for this name change.
* src/nsgui.h, src/sysselect.h, src/s/darwin.h:
Remove workaround that is no longer needed.
Diffstat (limited to 'src/sysselect.h')
| -rw-r--r-- | src/sysselect.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/sysselect.h b/src/sysselect.h index 2dbbede2bff..24bdf469ced 100644 --- a/src/sysselect.h +++ b/src/sysselect.h | |||
| @@ -16,15 +16,9 @@ GNU General Public License for more details. | |||
| 16 | You should have received a copy of the GNU General Public License | 16 | You should have received a copy of the GNU General Public License |
| 17 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 17 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 18 | 18 | ||
| 19 | #if defined (DARWIN_OS) | ||
| 20 | #undef init_process | ||
| 21 | #endif | ||
| 22 | #ifndef DOS_NT | 19 | #ifndef DOS_NT |
| 23 | #include <sys/select.h> | 20 | #include <sys/select.h> |
| 24 | #endif | 21 | #endif |
| 25 | #if defined (DARWIN_OS) | ||
| 26 | #define init_process emacs_init_process | ||
| 27 | #endif | ||
| 28 | 22 | ||
| 29 | /* The w32 build defines select stuff in w32.h, which is included | 23 | /* The w32 build defines select stuff in w32.h, which is included |
| 30 | where w32 needs it, but not where sysselect.h is included. The w32 | 24 | where w32 needs it, but not where sysselect.h is included. The w32 |