diff options
| author | Eli Zaretskii | 2017-10-18 20:21:25 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2017-10-18 20:21:25 +0300 |
| commit | 2f7163fb72e764d2df046a4d816e1e0b81e41d18 (patch) | |
| tree | 9b36f3479120afd6a50b4fb112ddd86e295f6514 /src/process.c | |
| parent | 2551d28fe8344e0c122489965abc6c91d65bca06 (diff) | |
| download | emacs-2f7163fb72e764d2df046a4d816e1e0b81e41d18.tar.gz emacs-2f7163fb72e764d2df046a4d816e1e0b81e41d18.zip | |
Fix the MSDOS build.
* msdos/sed1v2.inp (GETADDRINFO_A_LIBS, LIBLCMS2, XDBE_LIBS)
(XDBE_FLAGS, HYBRID_MALLOC, LIBSYSTEMD_CFLAGS)
(LIBSYSTEMD_LIBS): Edit to empty.
(LIBRESOLV, DEPFLAGS, MKDEPDIR, YMF_PASS_LDFLAGS)
(PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS): Remove editing.
Remove editing of lines that are no longer present in
src/Makefile.in.
* msdos/sed2v2.inp (NEED_MKTIME_INTERNAL)
(NEED_MKTIME_WORKING): Define to 1.
(HAVE_STRUCT_DIRENT_D_TYPE): Define to 1 for
DJGPP >= 2.05.
(HAVE_STRUCT_ATTRIBUTE_ALIGNED): Define to 1.
Define PACKAGE_VERSION, not VERSION.
(FLEXIBLE_ARRAY_MEMBER): Define to empty.
(HAVE_DECL_*_UNLOCKED): Define to 0.
(HAVE___BUILTIN_FRAME_ADDRESS): Define to 1.
(PENDING_*): Don't define, as Gnulib no longer supports that.
Instead, define _IOERR as it is in libc/file.h.
* msdos/sed3v2.inp: Use $(CURDIR) instead of $(shell cd) to
determine the current directory.
(UPDATE_MANIFEST, UTILITIES): Don't edit.
* msdos/sedlisp.inp (FIND_DELETE): Edit to "-delete".
* msdos/sedlibmk.inp (AUTO_DEPEND): Define to yes.
(HYBRID_MALLOC): Edit to empty.
(am__cd): Don't edit.
(../config.status): Replaces $(top_builddir)/config.status.
Define OMIT_GNULIB_MODULE_foo = true for modules not built for
MS-DOS. Convert GL_GENERATE_xxx_H_TRUE and
GL_GENERATE_xxx_H_FALSE into values of GL_GENERATE_xxx_H.
* msdos/mainmake.v2 (src): Use 'compile-one-process', and make
the command line shorter to fit into 126-char limit of
command.com.
* config.bat: Generate src/deps/*.d files. Rename more files
like djtar on plain DOS would.
Don't rename src/dir.h: it is long gone. Edit
lib/gnulib.mk.in using the same scripts as for
lib/Makefile.in.
* msdos/depfiles.bat: Create *.d files, not *.Po.
* src/thread.c (Fmake_thread) [!THREADS_ENABLED]: Improve the
error message.
* src/thread.h [MSDOS]: Include <signal.h>.
* src/sysselect.h (select) [MSDOS]: Undefine, to avoid
compilation errors.
* src/sysdep.c (block_interrupt_signal, restore_signal_mask):
Expose to MSDOS build.
* src/process.c (update_processes_for_thread_death)
[!subprocess]: No-op implementation.
[HAVE_SETRLIMIT]: Move inclusion of sys/resource.h and
declaration of nofile_limit outside "#ifdef subprocesses", as
it's needed for MSDOS.
* src/msdos.c (faccessat): Declare fullname[].
* src/msdos.h (ENOTSUP): Define to be identical to ENOSYS.
Include termhooks.h.
* src/conf_post.h [WINDOWSNT]: Include ms-w32.h only on
WINDOWSNT, not DOS_NT.
* admin/admin.el (set-version): Set version on PACKAGE_VERSION.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/process.c b/src/process.c index 943cb2a1048..fc46e743328 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -40,6 +40,8 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ | |||
| 40 | #include <netinet/in.h> | 40 | #include <netinet/in.h> |
| 41 | #include <arpa/inet.h> | 41 | #include <arpa/inet.h> |
| 42 | 42 | ||
| 43 | #endif /* subprocesses */ | ||
| 44 | |||
| 43 | #ifdef HAVE_SETRLIMIT | 45 | #ifdef HAVE_SETRLIMIT |
| 44 | # include <sys/resource.h> | 46 | # include <sys/resource.h> |
| 45 | 47 | ||
| @@ -49,6 +51,8 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ | |||
| 49 | static struct rlimit nofile_limit; | 51 | static struct rlimit nofile_limit; |
| 50 | #endif | 52 | #endif |
| 51 | 53 | ||
| 54 | #ifdef subprocesses | ||
| 55 | |||
| 52 | /* Are local (unix) sockets supported? */ | 56 | /* Are local (unix) sockets supported? */ |
| 53 | #if defined (HAVE_SYS_UN_H) | 57 | #if defined (HAVE_SYS_UN_H) |
| 54 | #if !defined (AF_LOCAL) && defined (AF_UNIX) | 58 | #if !defined (AF_LOCAL) && defined (AF_UNIX) |
| @@ -7455,6 +7459,13 @@ keyboard_bit_set (fd_set *mask) | |||
| 7455 | 7459 | ||
| 7456 | #else /* not subprocesses */ | 7460 | #else /* not subprocesses */ |
| 7457 | 7461 | ||
| 7462 | /* This is referenced in thread.c:run_thread (which is never actually | ||
| 7463 | called, since threads are not enabled for this configuration. */ | ||
| 7464 | void | ||
| 7465 | update_processes_for_thread_death (Lisp_Object dying_thread) | ||
| 7466 | { | ||
| 7467 | } | ||
| 7468 | |||
| 7458 | /* Defined in msdos.c. */ | 7469 | /* Defined in msdos.c. */ |
| 7459 | extern int sys_select (int, fd_set *, fd_set *, fd_set *, | 7470 | extern int sys_select (int, fd_set *, fd_set *, fd_set *, |
| 7460 | struct timespec *, void *); | 7471 | struct timespec *, void *); |