aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorGlenn Morris2015-04-20 20:29:48 -0400
committerGlenn Morris2015-04-20 20:29:48 -0400
commite3bfb5191f6144c9ac96772fea9f40c2e988c75b (patch)
treee18b3a1f62728dd7885aed168af6117a45fab0f4 /src/process.c
parentaffca0fc843426a35c3116d6791f3ec2dd282f6a (diff)
downloademacs-e3bfb5191f6144c9ac96772fea9f40c2e988c75b.tar.gz
emacs-e3bfb5191f6144c9ac96772fea9f40c2e988c75b.zip
Avoid non-nil current-load-list at startup
* src/process.c (init_process_emacs): Move Fprovide statement... (syms_of_process): ... to here.
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c69
1 files changed, 35 insertions, 34 deletions
diff --git a/src/process.c b/src/process.c
index 3ffbbec544b..c7455072962 100644
--- a/src/process.c
+++ b/src/process.c
@@ -7498,40 +7498,6 @@ init_process_emacs (void)
7498 memset (datagram_address, 0, sizeof datagram_address); 7498 memset (datagram_address, 0, sizeof datagram_address);
7499#endif 7499#endif
7500 7500
7501 {
7502 Lisp_Object subfeatures = Qnil;
7503 const struct socket_options *sopt;
7504
7505#define ADD_SUBFEATURE(key, val) \
7506 subfeatures = pure_cons (pure_cons (key, pure_cons (val, Qnil)), subfeatures)
7507
7508#ifdef NON_BLOCKING_CONNECT
7509 ADD_SUBFEATURE (QCnowait, Qt);
7510#endif
7511#ifdef DATAGRAM_SOCKETS
7512 ADD_SUBFEATURE (QCtype, Qdatagram);
7513#endif
7514#ifdef HAVE_SEQPACKET
7515 ADD_SUBFEATURE (QCtype, Qseqpacket);
7516#endif
7517#ifdef HAVE_LOCAL_SOCKETS
7518 ADD_SUBFEATURE (QCfamily, Qlocal);
7519#endif
7520 ADD_SUBFEATURE (QCfamily, Qipv4);
7521#ifdef AF_INET6
7522 ADD_SUBFEATURE (QCfamily, Qipv6);
7523#endif
7524#ifdef HAVE_GETSOCKNAME
7525 ADD_SUBFEATURE (QCservice, Qt);
7526#endif
7527 ADD_SUBFEATURE (QCserver, Qt);
7528
7529 for (sopt = socket_options; sopt->name; sopt++)
7530 subfeatures = pure_cons (intern_c_string (sopt->name), subfeatures);
7531
7532 Fprovide (intern_c_string ("make-network-process"), subfeatures);
7533 }
7534
7535#if defined (DARWIN_OS) 7501#if defined (DARWIN_OS)
7536 /* PTYs are broken on Darwin < 6, but are sometimes useful for interactive 7502 /* PTYs are broken on Darwin < 6, but are sometimes useful for interactive
7537 processes. As such, we only change the default value. */ 7503 processes. As such, we only change the default value. */
@@ -7753,4 +7719,39 @@ The variable takes effect when `start-process' is called. */);
7753 defsubr (&Sprocess_inherit_coding_system_flag); 7719 defsubr (&Sprocess_inherit_coding_system_flag);
7754 defsubr (&Slist_system_processes); 7720 defsubr (&Slist_system_processes);
7755 defsubr (&Sprocess_attributes); 7721 defsubr (&Sprocess_attributes);
7722
7723 {
7724 Lisp_Object subfeatures = Qnil;
7725 const struct socket_options *sopt;
7726
7727#define ADD_SUBFEATURE(key, val) \
7728 subfeatures = pure_cons (pure_cons (key, pure_cons (val, Qnil)), subfeatures)
7729
7730#ifdef NON_BLOCKING_CONNECT
7731 ADD_SUBFEATURE (QCnowait, Qt);
7732#endif
7733#ifdef DATAGRAM_SOCKETS
7734 ADD_SUBFEATURE (QCtype, Qdatagram);
7735#endif
7736#ifdef HAVE_SEQPACKET
7737 ADD_SUBFEATURE (QCtype, Qseqpacket);
7738#endif
7739#ifdef HAVE_LOCAL_SOCKETS
7740 ADD_SUBFEATURE (QCfamily, Qlocal);
7741#endif
7742 ADD_SUBFEATURE (QCfamily, Qipv4);
7743#ifdef AF_INET6
7744 ADD_SUBFEATURE (QCfamily, Qipv6);
7745#endif
7746#ifdef HAVE_GETSOCKNAME
7747 ADD_SUBFEATURE (QCservice, Qt);
7748#endif
7749 ADD_SUBFEATURE (QCserver, Qt);
7750
7751 for (sopt = socket_options; sopt->name; sopt++)
7752 subfeatures = pure_cons (intern_c_string (sopt->name), subfeatures);
7753
7754 Fprovide (intern_c_string ("make-network-process"), subfeatures);
7755 }
7756
7756} 7757}