diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-24 17:59:43 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-24 17:59:43 +0200 |
| commit | af50a76c3f251c82ef9d21ecf9a2ca8877852906 (patch) | |
| tree | c25039a06df294d9da880f110438d2f1c2a24088 /runtime/rsyslog.h | |
| parent | 4b05bef636c11cbaf4d32097ed9656a1447ed3d0 (diff) | |
| download | rsyslog-af50a76c3f251c82ef9d21ecf9a2ca8877852906.tar.gz rsyslog-af50a76c3f251c82ef9d21ecf9a2ca8877852906.tar.xz rsyslog-af50a76c3f251c82ef9d21ecf9a2ca8877852906.zip | |
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.
Diffstat (limited to 'runtime/rsyslog.h')
| -rw-r--r-- | runtime/rsyslog.h | 3 |
1 files changed, 0 insertions, 3 deletions
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; |