From af50a76c3f251c82ef9d21ecf9a2ca8877852906 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 24 Apr 2008 17:59:43 +0200 Subject: made this compile with the new abstracted socket server calls undid some invalid changes during merge plus did a few wrappers. Compiles, but does not yet work. --- runtime/rsyslog.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'runtime/rsyslog.h') diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index f59c38bf..c20a61ea 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -69,13 +69,10 @@ typedef struct netstrm_s netstrm_t; typedef struct nssel_s nssel_t; typedef enum nsdsel_waitOp_e nsdsel_waitOp_t; typedef struct nsd_ptcp_s nsd_ptcp_t; -<<<<<<< HEAD:runtime/rsyslog.h typedef struct nsd_gtls_s nsd_gtls_t; typedef struct nsd_gsspi_s nsd_gsspi_t; typedef struct nsd_nss_s nsd_nss_t; -======= typedef struct nsdsel_ptcp_s nsdsel_ptcp_t; ->>>>>>> a7040a9623e228043209da897dbf30b9ab02d771:runtime/rsyslog.h typedef obj_t nsd_t; typedef obj_t nsdsel_t; typedef struct msg msg_t; -- cgit