Synchronet now requires the libarchive development package (e.g. libarchive-dev on Debian-based Linux distros, libarchive.org for more info) to build successfully.

Commit 2aa75400 authored by rswindell's avatar rswindell

winsock2.h needs to be #included *before* windows.h.

Since sockwrap.h #Includes winsock2.h, let's #include it before any other
header files (e.g. genwrap.h)
parent 970a68c8
...@@ -36,10 +36,11 @@ ...@@ -36,10 +36,11 @@
#define STARTUP_INI_BITDESC_TABLES #define STARTUP_INI_BITDESC_TABLES
#include "sockwrap.h"
#include <string.h> /* strchr, memset */ #include <string.h> /* strchr, memset */
#include "dirwrap.h" /* backslash */
#include "sbbs_ini.h" #include "sbbs_ini.h"
#include "dirwrap.h" /* backslash */
#include "sbbsdefs.h" /* JAVASCRIPT_* macros */ #include "sbbsdefs.h" /* JAVASCRIPT_* macros */
static const char* nulstr=""; static const char* nulstr="";
......
...@@ -36,12 +36,12 @@ ...@@ -36,12 +36,12 @@
#ifndef _SBBS_INI_H #ifndef _SBBS_INI_H
#define _SBBS_INI_H #define _SBBS_INI_H
#include "ini_file.h"
#include "startup.h" /* bbs_startup_t */ #include "startup.h" /* bbs_startup_t */
#include "ftpsrvr.h" /* ftp_startup_t */ #include "ftpsrvr.h" /* ftp_startup_t */
#include "mailsrvr.h" /* mail_startup_t */ #include "mailsrvr.h" /* mail_startup_t */
#include "services.h" /* services_startup_t */ #include "services.h" /* services_startup_t */
#include "websrvr.h" /* services_startup_t */ #include "websrvr.h" /* services_startup_t */
#include "ini_file.h"
#include "scfgdefs.h" /* scfg_t */ #include "scfgdefs.h" /* scfg_t */
#if defined(__cplusplus) #if defined(__cplusplus)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment