From 653b3894fb12c1c2621ad37e695358311c4d6b1d Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Fri, 17 Jan 2003 21:50:27 +0000 Subject: [PATCH] * Began making some build changes for Cygwin compatibility --- citadel/ChangeLog | 4 ++++ citadel/Makefile.in | 1 - citadel/citserver.h | 2 +- citadel/config.h | 6 +++--- citadel/configure.ac | 2 +- citadel/internet_addressing.h | 4 ++-- citadel/server.h | 39 ++++++++++++----------------------- citadel/sysdep_decls.h | 12 +++++------ 8 files changed, 30 insertions(+), 40 deletions(-) diff --git a/citadel/ChangeLog b/citadel/ChangeLog index 6fa59f475..20cd97ab8 100644 --- a/citadel/ChangeLog +++ b/citadel/ChangeLog @@ -1,4 +1,7 @@ $Log$ + Revision 601.117 2003/01/17 21:50:27 ajc + * Began making some build changes for Cygwin compatibility + Revision 601.116 2003/01/17 10:06:54 error * fmout(): Ignore \r (carriage return) characters in messages @@ -4413,3 +4416,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant Fri Jul 10 1998 Art Cancro * Initial CVS import + diff --git a/citadel/Makefile.in b/citadel/Makefile.in index b8ef01f26..564f57c44 100644 --- a/citadel/Makefile.in +++ b/citadel/Makefile.in @@ -31,7 +31,6 @@ SERV_MODULES=serv_chat.o \ serv_pop3.o \ serv_vcard.o vcard.o \ serv_mrtg.o \ - serv_spam.o \ serv_imap.o imap_fetch.o imap_misc.o imap_search.o \ imap_store.o imap_tools.o \ serv_network.o \ diff --git a/citadel/citserver.h b/citadel/citserver.h index 3985bebd0..7e2bc7191 100644 --- a/citadel/citserver.h +++ b/citadel/citserver.h @@ -37,7 +37,7 @@ void citproto_begin_session(void); void GenerateRoomDisplay(char *real_room, struct CitContext *viewed, struct CitContext *viewer); -extern DLEXP int do_defrag; +extern int do_defrag; char CtdlCheckExpress(void); int CtdlAccessCheck(int); diff --git a/citadel/config.h b/citadel/config.h index 7e3801679..7de965864 100644 --- a/citadel/config.h +++ b/citadel/config.h @@ -7,6 +7,6 @@ void get_config(void); void put_config(void); -extern DLEXP struct config config; -extern DLEXP char bbs_home_directory[PATH_MAX]; -extern DLEXP int home_specified; +extern struct config config; +extern char bbs_home_directory[PATH_MAX]; +extern int home_specified; diff --git a/citadel/configure.ac b/citadel/configure.ac index d32210b54..2594773e8 100644 --- a/citadel/configure.ac +++ b/citadel/configure.ac @@ -434,7 +434,7 @@ if test "x$with_ncurses" != xno; then AC_CHECK_HEADERS(ncurses.h,,,[ ]) fi -AC_CHECK_HEADER(resolv.h, [SMTP=serv_smtp.o; DOMAIN=domain.c],, +AC_CHECK_HEADER(resolv.h, [SMTP=serv_smtp.o serv_spam.o; DOMAIN=domain.c],, [#ifdef HAVE_SYS_TYPES_H #include #endif diff --git a/citadel/internet_addressing.h b/citadel/internet_addressing.h index 314b2e90e..f9c610d6f 100644 --- a/citadel/internet_addressing.h +++ b/citadel/internet_addressing.h @@ -35,7 +35,7 @@ enum { hostalias_directory }; -extern DLEXP char *inetcfg; +extern char *inetcfg; struct spamstrings_t { @@ -43,5 +43,5 @@ struct spamstrings_t { char *string; }; -extern DLEXP struct spamstrings_t *spamstrings; +extern struct spamstrings_t *spamstrings; diff --git a/citadel/server.h b/citadel/server.h index a685c7fb5..e2e889330 100644 --- a/citadel/server.h +++ b/citadel/server.h @@ -18,19 +18,6 @@ #define INLINE #endif -#ifdef __CYGWIN__ - -#ifdef IN_LIBCIT -#define DLEXP __declspec(dllexport) -#else -#define DLEXP __declspec(dllimport) -#endif - -#else -#define DLEXP - -#endif /* __CYGWIN__ */ - #include "citadel.h" #ifdef HAVE_OPENSSL #include @@ -167,9 +154,9 @@ enum { struct CitContext *MyContext(void); #define CC ((struct CitContext *)MyContext()) -extern DLEXP struct CitContext *ContextList; -extern DLEXP int ScheduledShutdown; -extern DLEXP struct CitControl CitControl; +extern struct CitContext *ContextList; +extern int ScheduledShutdown; +extern struct CitControl CitControl; struct ExpressMessage { @@ -272,13 +259,13 @@ struct LogFunctionHook { int loglevel; void (*h_function_pointer) (char *); }; -extern DLEXP struct LogFunctionHook *LogHookTable; +extern struct LogFunctionHook *LogHookTable; struct CleanupFunctionHook { struct CleanupFunctionHook *next; void (*h_function_pointer) (void); }; -extern DLEXP struct CleanupFunctionHook *CleanupHookTable; +extern struct CleanupFunctionHook *CleanupHookTable; @@ -294,7 +281,7 @@ struct SessionFunctionHook { void (*h_function_pointer) (void); int eventtype; }; -extern DLEXP struct SessionFunctionHook *SessionHookTable; +extern struct SessionFunctionHook *SessionHookTable; /* * Event types can't be enum'ed, because they must remain consistent between @@ -322,7 +309,7 @@ struct UserFunctionHook { void (*h_function_pointer) (char *username, long usernum); int eventtype; }; -extern DLEXP struct UserFunctionHook *UserHookTable; +extern struct UserFunctionHook *UserHookTable; #define EVT_PURGEUSER 100 /* Deleting a user */ #define EVT_OUTPUTMSG 101 /* Outputting a message */ @@ -336,7 +323,7 @@ struct MessageFunctionHook { int (*h_function_pointer) (struct CtdlMessage *msg); int eventtype; }; -extern DLEXP struct MessageFunctionHook *MessageHookTable; +extern struct MessageFunctionHook *MessageHookTable; #define EVT_BEFOREREAD 200 #define EVT_BEFORESAVE 201 @@ -353,7 +340,7 @@ struct NetprocFunctionHook { struct NetprocFunctionHook *next; int (*h_function_pointer) (struct CtdlMessage *msg, char *target_room); }; -extern DLEXP struct NetprocFunctionHook *NetprocHookTable; +extern struct NetprocFunctionHook *NetprocHookTable; /* @@ -364,7 +351,7 @@ struct DeleteFunctionHook { struct DeleteFunctionHook *next; void (*h_function_pointer) (char *target_room, long msgnum); }; -extern DLEXP struct DeleteFunctionHook *DeleteHookTable; +extern struct DeleteFunctionHook *DeleteHookTable; /* @@ -378,7 +365,7 @@ struct XmsgFunctionHook { int (*h_function_pointer) (char *, char *, char *); int order; }; -extern DLEXP struct XmsgFunctionHook *XmsgHookTable; +extern struct XmsgFunctionHook *XmsgHookTable; /* Priority levels for paging functions (lower is better) */ enum { @@ -402,7 +389,7 @@ struct ServiceFunctionHook { void (*h_command_function) (void) ; int msock; }; -extern DLEXP struct ServiceFunctionHook *ServiceHookTable; +extern struct ServiceFunctionHook *ServiceHookTable; @@ -461,7 +448,7 @@ struct TheHeap { void *h_ptr; }; -extern DLEXP struct TheHeap *heap; +extern struct TheHeap *heap; #else diff --git a/citadel/sysdep_decls.h b/citadel/sysdep_decls.h index 2078182c0..023ee935a 100644 --- a/citadel/sysdep_decls.h +++ b/citadel/sysdep_decls.h @@ -37,13 +37,13 @@ void InitializeMasterCC(void); void init_master_fdset(void); void create_worker(void); -extern DLEXP int num_sessions; -extern DLEXP volatile int time_to_die; -extern DLEXP int verbosity; -extern DLEXP int rescan[]; -extern DLEXP pthread_t initial_thread; +extern int num_sessions; +extern volatile int time_to_die; +extern int verbosity; +extern int rescan[]; +extern pthread_t initial_thread; -extern DLEXP struct worker_node { +extern struct worker_node { pthread_t tid; struct worker_node *next; } *worker_list; -- 2.30.2