From 943ee022c7e6172c11f65bfe1e832221e3b821d5 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Fri, 24 Sep 2004 20:30:53 +0000
Subject: [PATCH] Moved #inclusion of startup.h from scfgdefs.h to sbbs.h, but
only if C++.
---
src/sbbs3/sbbs.h | 4 +++-
src/sbbs3/scfgdefs.h | 2 --
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/sbbs3/sbbs.h b/src/sbbs3/sbbs.h
index 92c06fbf9d..758b42b146 100644
--- a/src/sbbs3/sbbs.h
+++ b/src/sbbs3/sbbs.h
@@ -103,8 +103,10 @@
/***********************/
/* Synchronet-specific */
/***********************/
+#ifdef __cplusplus
+ #include "startup.h"
+#endif
#ifdef SBBS
- #include "threadwrap.h" /* must be before dirwrap.h for OpenBSD FULLPATH */
#include "text.h"
#endif
#include "genwrap.h"
diff --git a/src/sbbs3/scfgdefs.h b/src/sbbs3/scfgdefs.h
index 9259fedce1..33387420e6 100644
--- a/src/sbbs3/scfgdefs.h
+++ b/src/sbbs3/scfgdefs.h
@@ -40,8 +40,6 @@
#ifndef _SCFGDEFS_H_
#define _SCFGDEFS_H_
-#include "startup.h"
-
typedef struct { /* Message sub board info */
char code[LEN_EXTCODE+1]; /* Internal code (with optional lib prefix) */
char code_suffix[LEN_CODE+1]; /* Eight character code suffix */
--
GitLab