summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2018-09-28 16:17:01 +0000
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2018-09-28 16:17:01 +0000
commit175816376de22629f41e08c30644f09af18438aa (patch)
tree665867e2fbd83a246871b0fa2c93fd147707b507
parent021688d241f4a7e524467c6f410264aa6eb8c885 (diff)
parent706b1811aa2c0a4bef6e28680f4643318c30cc13 (diff)
downloadgnutls-175816376de22629f41e08c30644f09af18438aa.tar.gz
Merge branch 'tmp-fix-buffer-t' into 'master'
Make tlsproxy/buffer.c compilable by gcc 4.4.7 Closes #577 See merge request gnutls/gnutls!763
-rw-r--r--doc/examples/tlsproxy/buffer.c4
-rw-r--r--doc/examples/tlsproxy/crypto-gnutls.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/examples/tlsproxy/buffer.c b/doc/examples/tlsproxy/buffer.c
index 8224d793bc..cd1ff37eea 100644
--- a/doc/examples/tlsproxy/buffer.c
+++ b/doc/examples/tlsproxy/buffer.c
@@ -29,7 +29,7 @@ OTHER DEALINGS IN THE SOFTWARE.
#include "buffer.h"
-typedef struct buffer
+struct buffer
{
char *buf;
ssize_t size;
@@ -37,7 +37,7 @@ typedef struct buffer
ssize_t ridx;
ssize_t widx;
int empty;
-} buffer_t;
+};
/* the buffer is organised internally as follows:
*
diff --git a/doc/examples/tlsproxy/crypto-gnutls.c b/doc/examples/tlsproxy/crypto-gnutls.c
index 14abb56620..634f417b42 100644
--- a/doc/examples/tlsproxy/crypto-gnutls.c
+++ b/doc/examples/tlsproxy/crypto-gnutls.c
@@ -49,7 +49,7 @@ OTHER DEALINGS IN THE SOFTWARE.
#define FALSE 0
#define TRUE 1
-typedef struct tlssession
+struct tlssession
{
gnutls_certificate_credentials_t creds;
gnutls_session_t session;
@@ -58,7 +58,7 @@ typedef struct tlssession
int (*erroutfn) (void *opaque, const char *format, va_list ap);
int debug;
void *opaque;
-} tlssession_t;
+};
#define BUF_SIZE 65536
#define BUF_HWM ((BUF_SIZE*3)/4)