From bd956f5cae62e60dc5028dacc7176be395e6c060 Mon Sep 17 00:00:00 2001 From: rswindell <> Date: Sun, 26 Sep 2004 20:06:44 +0000 Subject: [PATCH] #including proper xpdev headers in the right files. --- src/sbbs3/mailsrvr.h | 3 ++- src/sbbs3/sbbs.h | 1 + src/sbbs3/sbbscon.c | 5 ++++- src/sbbs3/services.h | 3 ++- src/sbbs3/startup.h | 2 +- src/sbbs3/websrvr.c | 3 ++- src/sbbs3/websrvr.h | 1 + 7 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/sbbs3/mailsrvr.h b/src/sbbs3/mailsrvr.h index 04f44595e6..0d1ae33f61 100644 --- a/src/sbbs3/mailsrvr.h +++ b/src/sbbs3/mailsrvr.h @@ -8,7 +8,7 @@ * @format.tab-size 4 (Plain Text/Source Code File Header) * * @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) * * * - * Copyright 2003 Rob Swindell - http://www.synchro.net/copyright.html * + * Copyright 2004 Rob Swindell - http://www.synchro.net/copyright.html * * * * This program is free software; you can redistribute it and/or * * modify it under the terms of the GNU General Public License * @@ -40,6 +40,7 @@ #include "client.h" /* client_t */ #include "sockwrap.h" /* SOCKET */ +#include "semwrap.h" /* sem_t */ typedef struct { diff --git a/src/sbbs3/sbbs.h b/src/sbbs3/sbbs.h index 758b42b146..0426b3bb6d 100644 --- a/src/sbbs3/sbbs.h +++ b/src/sbbs3/sbbs.h @@ -105,6 +105,7 @@ /***********************/ #ifdef __cplusplus #include "startup.h" + #include "threadwrap.h" /* pthread_mutex_t */ #endif #ifdef SBBS #include "text.h" diff --git a/src/sbbs3/sbbscon.c b/src/sbbs3/sbbscon.c index 5ca7d2dad2..2446f3eb6d 100644 --- a/src/sbbs3/sbbscon.c +++ b/src/sbbs3/sbbscon.c @@ -45,13 +45,16 @@ #endif /* Synchronet-specific headers */ -#include "conwrap.h" /* kbhit/getch */ #include "sbbs.h" /* load_cfg() */ #include "sbbs_ini.h" /* sbbs_read_ini() */ #include "ftpsrvr.h" /* ftp_startup_t, ftp_server */ #include "mailsrvr.h" /* mail_startup_t, mail_server */ #include "services.h" /* services_startup_t, services_thread */ +/* XPDEV headers */ +#include "conwrap.h" /* kbhit/getch */ +#include "threadwrap.h" /* pthread_mutex_t */ + #ifdef __unix__ #include <sys/types.h> diff --git a/src/sbbs3/services.h b/src/sbbs3/services.h index 277f0f6855..86e43f3189 100644 --- a/src/sbbs3/services.h +++ b/src/sbbs3/services.h @@ -8,7 +8,7 @@ * @format.tab-size 4 (Plain Text/Source Code File Header) * * @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) * * * - * Copyright 2003 Rob Swindell - http://www.synchro.net/copyright.html * + * Copyright 2004 Rob Swindell - http://www.synchro.net/copyright.html * * * * This program is free software; you can redistribute it and/or * * modify it under the terms of the GNU General Public License * @@ -43,6 +43,7 @@ #endif #include "client.h" +#include "semwrap.h" /* sem_t */ typedef struct { diff --git a/src/sbbs3/startup.h b/src/sbbs3/startup.h index 6c00786188..1cdfead3b2 100644 --- a/src/sbbs3/startup.h +++ b/src/sbbs3/startup.h @@ -44,7 +44,7 @@ #include "client.h" #include "ringbuf.h" -#include "threadwrap.h" /* sem_t */ +#include "semwrap.h" /* sem_t */ #include "ini_file.h" /* INI_MAX_VALUE_LEN */ typedef struct { diff --git a/src/sbbs3/websrvr.c b/src/sbbs3/websrvr.c index 7aef0e133e..cb8071f0eb 100644 --- a/src/sbbs3/websrvr.c +++ b/src/sbbs3/websrvr.c @@ -8,7 +8,7 @@ * @format.tab-size 4 (Plain Text/Source Code File Header) * * @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) * * * - * Copyright 2003 Rob Swindell - http://www.synchro.net/copyright.html * + * Copyright 2004 Rob Swindell - http://www.synchro.net/copyright.html * * * * This program is free software; you can redistribute it and/or * * modify it under the terms of the GNU General Public License * @@ -99,6 +99,7 @@ #include "sbbs.h" #include "link_list.h" #include "sockwrap.h" /* sendfilesocket() */ +#include "threadwrap.h" /* pthread_mutex_t */ #include "semwrap.h" #include "websrvr.h" #include "base64.h" diff --git a/src/sbbs3/websrvr.h b/src/sbbs3/websrvr.h index 687fe36354..5382efb9f3 100644 --- a/src/sbbs3/websrvr.h +++ b/src/sbbs3/websrvr.h @@ -40,6 +40,7 @@ #include "client.h" /* client_t */ #include "startup.h" /* BBS_OPT_* */ +#include "semwrap.h" /* sem_t */ typedef struct { DWORD size; /* sizeof(web_startup_t) */ -- GitLab