Where gettimeofday() is required, include both time.h and sys/time.h

diff --git a/citadel/server/citserver.c b/citadel/server/citserver.c
index aa7e19139b22c991f94ce8631cae33b7c0601516..016dad7b49cef1c0b56b8d5dc8b10dce56a9be09 100644 (file)
--- a/citadel/server/citserver.c
+++ b/citadel/server/citserver.c
@@ -11,8 +11,8 @@
 #include <sys/stat.h>
 #include "sysdep.h"
 #include <time.h>
+#include <sys/time.h>
 #include <libcitadel.h>
-
 #include "ctdl_module.h"
 #include "housekeeping.h"
 #include "locate_host.h"

diff --git a/citadel/server/locate_host.c b/citadel/server/locate_host.c
index 98cfc9c953a6c7c7b8502d9b14d694605149f84f..635862f41b952e2a95ea732bae43064ec75f84e3 100644 (file)
--- a/citadel/server/locate_host.c
+++ b/citadel/server/locate_host.c
@@ -1,6 +1,6 @@
 // Functions which handle hostname/address lookups and resolution
 //
-// Copyright (c) 1987-2019 by the citadel.org team
+// Copyright (c) 1987-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or disclosure
 // is subject to the terms of the GNU General Public License, version 3.
@@ -13,6 +13,7 @@
 #include <netdb.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <sys/time.h>
 #include <libcitadel.h>
 
 #include "context.h"

diff --git a/citadel/server/modules/imap/serv_imap.c b/citadel/server/modules/imap/serv_imap.c
index 5fc769652bbeb33746d51198fa4ae2522af66514..d55971bb5f76de414b88cd4122b3bf9ad3ea2d8a 100644 (file)
--- a/citadel/server/modules/imap/serv_imap.c
+++ b/citadel/server/modules/imap/serv_imap.c
@@ -15,6 +15,7 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <time.h>
+#include <sys/time.h>
 #include <sys/wait.h>
 #include <ctype.h>
 #include <string.h>

diff --git a/textclient/config.mk b/textclient/config.mk
index 2e87ed94af3d7d677ff2161a1ec4a5d754b2d165..de21005a5666c55491834aa865fcfea1701ff4c0 100644 (file)
--- a/textclient/config.mk
+++ b/textclient/config.mk
@@ -1,5 +1,5 @@
 CFLAGS := -g -I/usr/local/include -DHAVE_OPENSSL
 LDFLAGS := -L/usr/local/lib -lssl -lcrypto -lz
-PREFIX := /usr/local/citadel
-BINDIR := /usr/local/citadel/bin
-CTDLDIR := /usr/local/citadel
+PREFIX := /root/citadel/textclient
+BINDIR := /root/citadel/textclient/bin
+CTDLDIR := /root/citadel/citadel