From bb945d8106460b7f13a864f2d7b18dcdf49572d6 Mon Sep 17 00:00:00 2001
From: David Hedbor <david@hedbor.org>
Date: Thu, 16 Nov 1995 13:46:47 +0100
Subject: [PATCH] committing
Rev: src/modules/files/efuns.c:1.2
Rev: src/modules/files/file.c:1.5
Rev: src/modules/files/socket.c:1.3
---
src/modules/files/efuns.c | 7 +++----
src/modules/files/file.c | 2 ++
src/modules/files/socket.c | 2 ++
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/modules/files/efuns.c b/src/modules/files/efuns.c
index ba75f2805f..215ad7a889 100644
--- a/src/modules/files/efuns.c
+++ b/src/modules/files/efuns.c
@@ -199,10 +199,7 @@ void f_getcwd(INT32 args)
char *e;
pop_n_elems(args);
-#ifdef HAVE_GETCWD
- e=(char *)getcwd(0,1000);
-#else
-
+#ifdef HAVE_GETWD
#ifndef MAXPATHLEN
#define MAXPATHLEN 32768
#endif
@@ -210,6 +207,8 @@ void f_getcwd(INT32 args)
e=(char *)getwd((char *)malloc(MAXPATHLEN+1));
if(!e)
fatal("Couldn't fetch current path.\n");
+#else
+ e=(char *)getcwd(0,1000);
#endif
push_string(make_shared_string(e));
free(e);
diff --git a/src/modules/files/file.c b/src/modules/files/file.c
index 3cb08d6587..6c4e586504 100644
--- a/src/modules/files/file.c
+++ b/src/modules/files/file.c
@@ -54,6 +54,8 @@ static struct program *file_program;
static void file_read_callback(int fd, void *data);
static void file_write_callback(int fd, void *data);
+#undef u
+
static void init_fd(int fd, int open_mode)
{
files[fd].refs=1;
diff --git a/src/modules/files/socket.c b/src/modules/files/socket.c
index a2c84c2c48..9dba653673 100644
--- a/src/modules/files/socket.c
+++ b/src/modules/files/socket.c
@@ -44,6 +44,8 @@
mutex_t *locks;
#endif
+#undef u
+
struct port
{
int fd;
--
GitLab