aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJim Blandy1993-05-21 23:39:17 +0000
committerJim Blandy1993-05-21 23:39:17 +0000
commit02a76f8aca37c597d988e54ac946849abefe41ce (patch)
tree14547a0727355d549628910fd2b9b21c9b0179c4 /src
parentb49ef4553bbd305f234eb8158f138203ac78058e (diff)
downloademacs-02a76f8aca37c597d988e54ac946849abefe41ce.tar.gz
emacs-02a76f8aca37c597d988e54ac946849abefe41ce.zip
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r--src/alloca.c8
-rw-r--r--src/s/sco4.h3
2 files changed, 1 insertions, 10 deletions
diff --git a/src/alloca.c b/src/alloca.c
index b83b35d277b..bc34529fdd2 100644
--- a/src/alloca.c
+++ b/src/alloca.c
@@ -42,10 +42,6 @@ lose
42#endif /* static */ 42#endif /* static */
43#endif /* emacs */ 43#endif /* emacs */
44 44
45#ifdef emacs
46#define free xfree
47#endif
48
49/* If your stack is a linked list of frames, you have to 45/* If your stack is a linked list of frames, you have to
50 provide an "address metric" ADDRESS_FUNCTION macro. */ 46 provide an "address metric" ADDRESS_FUNCTION macro. */
51 47
@@ -64,8 +60,6 @@ typedef char *pointer;
64 60
65#define NULL 0 61#define NULL 0
66 62
67extern pointer xmalloc ();
68
69/* Define STACK_DIRECTION if you know the direction of stack 63/* Define STACK_DIRECTION if you know the direction of stack
70 growth for your system; otherwise it will be automatically 64 growth for your system; otherwise it will be automatically
71 deduced at run-time. 65 deduced at run-time.
@@ -181,7 +175,7 @@ alloca (size)
181 /* Allocate combined header + user data storage. */ 175 /* Allocate combined header + user data storage. */
182 176
183 { 177 {
184 register pointer new = xmalloc (sizeof (header) + size); 178 register pointer new = malloc (sizeof (header) + size);
185 /* Address of header. */ 179 /* Address of header. */
186 180
187 ((header *) new)->h.next = last_alloca_header; 181 ((header *) new)->h.next = last_alloca_header;
diff --git a/src/s/sco4.h b/src/s/sco4.h
index e111d977162..a94e27dcb51 100644
--- a/src/s/sco4.h
+++ b/src/s/sco4.h
@@ -46,9 +46,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
46/* SCO has bcopy, et. al. */ 46/* SCO has bcopy, et. al. */
47#define BSTRING 47#define BSTRING
48 48
49/* Use both <time.h> and <sys/time.h>. */
50#define TIME_WITH_SYS_TIME
51
52/* Sockets are an option on SCO. If we have X, we have them. */ 49/* Sockets are an option on SCO. If we have X, we have them. */
53#ifdef HAVE_X_WINDOWS 50#ifdef HAVE_X_WINDOWS
54#define HAVE_SOCKETS 51#define HAVE_SOCKETS