From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Mon, 10 Jan 2011 16:55:29 +0000 (+0100)
Subject: portability fix: lib/rfcnb symbol shuffling
X-Git-Tag: take00~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=231fda33553d6bab4cb1afa50f265786e0a02f10;p=thirdparty%2Fsquid.git

portability fix: lib/rfcnb symbol shuffling
---

diff --git a/lib/rfcnb/rfcnb-io.c b/lib/rfcnb/rfcnb-io.c
index 9fd93dabb8..06786c4e46 100644
--- a/lib/rfcnb/rfcnb-io.c
+++ b/lib/rfcnb/rfcnb-io.c
@@ -38,7 +38,7 @@
 
 int RFCNB_Timeout = 0;          /* Timeout in seconds ... */
 
-int RFCNB_Discard_Rest(struct RFCNB_Con *con, int len);
+static int RFCNB_Discard_Rest(struct RFCNB_Con *con, int len);
 
 #ifdef NOT_USED
 void
diff --git a/lib/rfcnb/rfcnb-util.c b/lib/rfcnb/rfcnb-util.c
index f1e7ef251f..c28f43fa7f 100644
--- a/lib/rfcnb/rfcnb-util.c
+++ b/lib/rfcnb/rfcnb-util.c
@@ -38,8 +38,6 @@
 #include <string.h>
 #endif
 
-extern void (*Prot_Print_Routine) (FILE * fd, int dir, struct RFCNB_Pkt * pkt, int header, int payload);   /* Pointer to protocol print routine */
-
 const char *RFCNB_Error_Strings[] = {
     "RFCNBE_OK: Routine completed successfully.",
     "RFCNBE_NoSpace: No space available for a malloc call.",
diff --git a/lib/rfcnb/rfcnb-util.h b/lib/rfcnb/rfcnb-util.h
index 4415b11e4d..1fe1a4a8f1 100644
--- a/lib/rfcnb/rfcnb-util.h
+++ b/lib/rfcnb/rfcnb-util.h
@@ -45,3 +45,6 @@ int RFCNB_Session_Req(struct RFCNB_Con *con,
                       BOOL * redirect,
                       struct in_addr *Dest_IP,
                       int *port);
+
+typedef void RFCNB_Prot_Print_Routine(FILE * fd, int dir, struct RFCNB_Pkt *pkt, int header, int payload);
+extern RFCNB_Prot_Print_Routine *Prot_Print_Routine;
diff --git a/lib/rfcnb/session.c b/lib/rfcnb/session.c
index c3b87df56f..0f279b9586 100644
--- a/lib/rfcnb/session.c
+++ b/lib/rfcnb/session.c
@@ -42,7 +42,6 @@ int RFCNB_saved_errno = 0;
 
 int RFCNB_Stats[RFCNB_MAX_STATS];
 
-typedef void RFCNB_Prot_Print_Routine(FILE * fd, int dir, struct RFCNB_Pkt *pkt, int header, int payload);
 RFCNB_Prot_Print_Routine *Prot_Print_Routine = NULL;   /* Pointer to protocol print routine */
 
 int RFCNB_Get_Last_Errno(void);