X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_sasl.h;h=b34b7c1fb90d0f7631039acaa992b7b36c8db4e8;hp=9896cc511556bc126f740cc73f5c5706635471ba;hb=37bbc8dcb3e9c795bd04ccfc5ac59f9810908c3c;hpb=355d6c883e8aafb8f424c22aa576cf8262ed9e58

diff --git a/mutt_sasl.h b/mutt_sasl.h
index 9896cc5..b34b7c1 100644
--- a/mutt_sasl.h
+++ b/mutt_sasl.h
@@ -12,13 +12,9 @@
 #ifndef _MUTT_SASL_H_
 #define _MUTT_SASL_H_ 1
 
-#ifdef USE_SASL2
 #include <sasl/sasl.h>
-#else
-#include <sasl.h>
-#endif
 
-#include "mutt_socket.h"
+#include <lib-sys/mutt_socket.h>
 
 int mutt_sasl_client_new (CONNECTION *, sasl_conn_t **);
 sasl_callback_t *mutt_sasl_get_callbacks (ACCOUNT *);
@@ -32,20 +28,16 @@ typedef struct {
   const unsigned int *pbufsize;
 
   /* read buffer */
-#ifdef USE_SASL2
   const char *buf;
-#else
-  char *buf;
-#endif
-  unsigned int blen;
+  unsigned blen;
   unsigned int bpos;
 
   /* underlying socket data */
   void *sockdata;
   int (*msasl_open) (CONNECTION * conn);
   int (*msasl_close) (CONNECTION * conn);
-  int (*msasl_read) (CONNECTION * conn, char *buf, size_t len);
-  int (*msasl_write) (CONNECTION * conn, const char *buf, size_t count);
+  int (*msasl_read) (CONNECTION * conn, char *buf, ssize_t len);
+  int (*msasl_write) (CONNECTION * conn, const char *buf, ssize_t count);
 } SASL_DATA;
 
 #endif /* _MUTT_SASL_H_ */