Turn around the sequence of PATH, so the former PATH will be in front of the newly...

[metze/wireshark/wip.git] / capture-wpcap.c

diff --git a/capture-wpcap.c b/capture-wpcap.c
index 1505f5ff8d8f4782694240fdeeff8d95df9aa003..3ccfeef4d3888263804711390f161b646fee813d 100644 (file)
--- a/capture-wpcap.c
+++ b/capture-wpcap.c
@@ -78,7 +78,7 @@ static const char *(*p_pcap_datalink_val_to_name) (int);
 #endif
 static const char *(*p_pcap_lib_version) (void);
 static int     (*p_pcap_setbuff) (pcap_t *, int dim);
-static int     (*p_pcap_next_ex) (pcap_t *, struct pcap_pkthdr **pkt_header, u_char **pkt_data);
+static int     (*p_pcap_next_ex) (pcap_t *, struct pcap_pkthdr **pkt_header, const u_char **pkt_data);
 
 typedef struct {
        const char      *name;
@@ -422,8 +422,9 @@ int pcap_setbuff(pcap_t *a, int b)
        return p_pcap_setbuff(a, b);
 }
 
-/* next_ex is win32 specific! */
-int pcap_next_ex (pcap_t *a, struct pcap_pkthdr **b, u_char **c)
+/* pcap_next_ex is available since libpcap 0.8 / WinPcap 3.0! */
+/* (if you get a declaration warning here, try to update to at least WinPcap 3.1b4 develpack) */
+int pcap_next_ex (pcap_t *a, struct pcap_pkthdr **b, const u_char **c)
 {
        g_assert(has_wpcap);
        return p_pcap_next_ex(a, b, c);
@@ -453,7 +454,7 @@ get_interface_list(int *err, char *err_str)
         * PacketGetAdapterNames.  According to the documentation
         * I could find:
         *
-        *      http://winpcap.polito.it/docs/man/html/Packet32_8c.html#a43
+        *      http://www.winpcap.org/docs/man/html/Packet32_8c.html#a43
         *
         * this means that:
         *
@@ -599,7 +600,7 @@ cant_get_if_list_error_message(const char *err_str)
            strstr(err_str, "The operation completed successfully") != NULL) {
                return g_strdup_printf("Can't get list of interfaces: %s\n"
 "This might be a problem with WinPcap 3.0; you should try updating to\n"
-"a later version of WinPcap - see the WinPcap site at winpcap.polito.it",
+"a later version of WinPcap - see the WinPcap site at www.winpcap.org",
                    err_str);
        }
        return g_strdup_printf("Can't get list of interfaces: %s", err_str);