X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Fwebcit.h;fp=webcit%2Fwebcit.h;h=d1ec72686044489c0d492380762c02c9ed44fae2;hp=d8fa7089bed378675a832709a43500510a72d24d;hb=bd7fb94bd91f725bdd84c281f2a06a72564b98d6;hpb=1a4ec92c7186ed2c0b9b6bf45afc47b69f3a800a

diff --git a/webcit/webcit.h b/webcit/webcit.h
index d8fa7089b..d1ec72686 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -321,6 +321,7 @@ enum {
 	eNone
 };
 
+<<<<<<< HEAD
 enum {
 	eGET,
 	ePOST,
@@ -727,3 +728,15 @@ void display_summary_page(void);
 
 HashList *GetValidDomainNames(StrBuf *Target, WCTemplputParams *TP);
 void output_error_pic(const char *ErrMsg1, const char *ErrMsg2);
+=======
+#define TRACE syslog(LOG_DEBUG, "\033[3%dmCHECKPOINT: %s:%d\033[0m", ((__LINE__%6)+1), __FILE__, __LINE__)
+#define SLEEPING		180		// TCP connection timeout
+#define MAX_WORKER_THREADS	32		// Maximum number of worker threads permitted to exist
+
+int webserver(char *webserver_interface, int webserver_port, int webserver_protocol);
+int webcit_tcp_server(const char *ip_addr, int port_number, int queue_len);
+int webcit_uds_server(char *sockpath, int queue_len);
+int lingering_close(int fd);
+void perform_one_http_transaction(int ssock);
+void worker_entry(int *pointer_to_master_socket);
+>>>>>>> af64ffb... textclient: don't try to stat citadel.config; it doesn't exist anymore.