Moved the protocol designation definition.

svn path=/trunk/; revision=119

diff --git a/Makefile.in b/Makefile.in
index 92b9bd9a522d6895559cdc73319d95f1faf49848..5fb143ef4a24c776a3e15f567adba69435e27669 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -198,8 +198,7 @@ $(srcdir)/rcfile_l.c: $(srcdir)/rcfile_l.l
 $(srcdir)/rcfile_y.c: $(srcdir)/rcfile_y.y
 
 parser = $(srcdir)/rcfile_l.l $(srcdir)/rcfile_y.y
-headers = $(srcdir)/fetchmail.h $(srcdir)/socket.h $(srcdir)/poproto.h \
-       $(srcdir)/smtp.h
+headers = $(srcdir)/fetchmail.h $(srcdir)/socket.h $(srcdir)/smtp.h
 extra = $(srcdir)/alloca.c $(srcdir)/bzero.[ch] $(srcdir)/errorcodes \
        $(srcdir)/getopt.[ch] $(srcdir)/getopt1.c $(srcdir)/md5*.[ch] \
        $(srcdir)/strcasecmp.c $(srcdir)/strdup.c

diff --git a/fetchmail.h b/fetchmail.h
index b439122607017bc7d74dd4043619df51edef10de..d1186803408a7b45bcb521caf6bff613df9695f5 100644 (file)
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -11,7 +11,13 @@
 
  ***********************************************************************/
 
-
+/* constants designating the various supported protocols */
+#define                P_AUTO  0
+#define                P_POP2  2
+#define                P_POP3  3
+#define                P_IMAP  4
+#define                P_APOP  5
+#define                P_RPOP  6
 
 /* definitions for buffer sizes -- somewhat arbitrary */
 #define                POPBUFSIZE      512     /* per RFC 937 */

diff --git a/rcfile_l.l b/rcfile_l.l
index 728c28006945347fd7c7bd037c2ae89e375d53a4..30ce29785e8bdeb6730a155b5bf9cd9b24ce71e5 100644 (file)
--- a/rcfile_l.l
+++ b/rcfile_l.l
@@ -15,7 +15,7 @@
  ***********************************************************************/
 
 #include <config.h>
-#include "poproto.h"
+#include "fetchmail.h"
 #include "rcfile_y.h"
 
 int prc_lineno = 1;