aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2012-07-31 18:24:49 -0400
committerGlenn Morris2012-07-31 18:24:49 -0400
commitb2c7a1068135e78b065d05069012f2fb240fea9d (patch)
treed45770f1ce4c3463b5448c95c799649ae4b555ec /src
parentd66060f8240bda3945e812d9172df3e6a7e4d67a (diff)
downloademacs-b2c7a1068135e78b065d05069012f2fb240fea9d.tar.gz
emacs-b2c7a1068135e78b065d05069012f2fb240fea9d.zip
* configure.ac (NULL_DEVICE, SEPCHAR, USER_FULL_NAME): Move here from src.
* src/editfns.c (USER_FULL_NAME): * src/emacs.c (SEPCHAR): * src/process.h (NULL_DEVICE): Let configure set them.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/editfns.c4
-rw-r--r--src/emacs.c3
-rw-r--r--src/process.h6
4 files changed, 4 insertions, 13 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 79f5bf821ef..46302316204 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
12012-07-31 Glenn Morris <rgm@gnu.org> 12012-07-31 Glenn Morris <rgm@gnu.org>
2 2
3 * process.h (NULL_DEVICE):
4 * emacs.c (SEPCHAR):
5 * editfns.c (USER_FULL_NAME): Let configure set them.
6
3 * s/README, s/template.h: Remove files. 7 * s/README, s/template.h: Remove files.
4 8
5 * conf_post.h [HPUX]: Undefine HAVE_RANDOM and HAVE_RINT. 9 * conf_post.h [HPUX]: Undefine HAVE_RANDOM and HAVE_RINT.
diff --git a/src/editfns.c b/src/editfns.c
index f174594dd97..dda6371369d 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -59,10 +59,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
59#include "window.h" 59#include "window.h"
60#include "blockinput.h" 60#include "blockinput.h"
61 61
62#ifndef USER_FULL_NAME
63#define USER_FULL_NAME pw->pw_gecos
64#endif
65
66#ifndef USE_CRT_DLL 62#ifndef USE_CRT_DLL
67extern char **environ; 63extern char **environ;
68#endif 64#endif
diff --git a/src/emacs.c b/src/emacs.c
index 81af0647742..bdc383c9ce1 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2222,9 +2222,6 @@ synchronize_system_messages_locale (void)
2222} 2222}
2223#endif /* HAVE_SETLOCALE */ 2223#endif /* HAVE_SETLOCALE */
2224 2224
2225#ifndef SEPCHAR
2226#define SEPCHAR ':'
2227#endif
2228 2225
2229Lisp_Object 2226Lisp_Object
2230decode_env_path (const char *evarname, const char *defalt) 2227decode_env_path (const char *evarname, const char *defalt)
diff --git a/src/process.h b/src/process.h
index 649056a99ff..747540f26a9 100644
--- a/src/process.h
+++ b/src/process.h
@@ -163,12 +163,6 @@ extern int synch_process_termsig;
163 this is exit code of synchronous subprocess. */ 163 this is exit code of synchronous subprocess. */
164extern int synch_process_retcode; 164extern int synch_process_retcode;
165 165
166/* The name of the file open to get a null file, or a data sink.
167 MS-DOS, and OS/2 redefine this. */
168#ifndef NULL_DEVICE
169#define NULL_DEVICE "/dev/null"
170#endif
171
172/* Nonzero means don't run process sentinels. This is used 166/* Nonzero means don't run process sentinels. This is used
173 when exiting. */ 167 when exiting. */
174extern int inhibit_sentinels; 168extern int inhibit_sentinels;