3 files changed, 4 insertions, 34 deletions

diff --git a/pcap-int.h b/pcap-int.h
index 4302ac36..f612913e 100644
--- a/pcap-int.h
+++ b/pcap-int.h
@@ -483,16 +483,6 @@ void	pcap_cleanup_live_common(pcap_t *);
 int	pcap_check_activated(pcap_t *);
 void	pcap_breakloop_common(pcap_t *);
 
-#ifdef _WIN32
-/*
- * XXX - TEMPORARY TO FIGURE OUT WHY WE'RE NOT GETTING WARNINGS ABOUT
- * ASSIGNMENT OF A POINTER TO CONST CHAR VALUE TO A POINTER TO CHAR
- * VARIABLE.
- */
-LPCSTR PacketGetLPCSTR(void);
-const char *PacketGetConstCharStar(void);
-#endif
-
 /*
  * Internal interfaces for "pcap_findalldevs()".
  *
diff --git a/pcap-npf.c b/pcap-npf.c
index 5aeb0a11..cdc0a715 100644
--- a/pcap-npf.c
+++ b/pcap-npf.c
@@ -38,7 +38,6 @@
 #include <errno.h>
 #define PCAP_DONT_INCLUDE_PCAP_BPF_H
 #include <Packet32.h>
-
 #include <pcap-int.h>
 #include <pcap/dlt.h>
 
@@ -2127,8 +2126,6 @@ pcap_lib_version(void)
 		 * Generate the version string.
 		 */
 		char *packet_version_string = PacketGetVersion();
-		char *packet_LPCSTR = PacketGetLPCSTR();
-		char *packet_const_char_star = PacketGetConstCharStar();
 
 		if (strcmp(WINPCAP_VER_STRING, packet_version_string) == 0) {
 			/*
@@ -2148,9 +2145,8 @@ pcap_lib_version(void)
 			char *full_pcap_version_string;
 
 			if (pcap_asprintf(&full_pcap_version_string,
-			    WINPCAP_PRODUCT_NAME " version " WINPCAP_VER_STRING " (packet.dll version %s), based on " PCAP_VERSION_STRING " blah blah blah %s %s",
-			    packet_version_string,
-			    packet_LPCSTR, packet_const_char_star) != -1) {
+			    WINPCAP_PRODUCT_NAME " version " WINPCAP_VER_STRING " (packet.dll version %s), based on " PCAP_VERSION_STRING,
+			    packet_version_string) != -1) {
 				/* Success */
 				pcap_lib_version_string = full_pcap_version_string;
 			}
@@ -2174,12 +2170,10 @@ pcap_lib_version(void)
 		 * version.
 		 */
 		char *full_pcap_version_string;
-		char *packet_LPCSTR = PacketGetLPCSTR();
-		char *packet_const_char_star = PacketGetConstCharStar();
 
 		if (pcap_asprintf(&full_pcap_version_string,
-		    PCAP_VERSION_STRING " (packet.dll version %s) blah blah blah %s",
-		    PacketGetVersion(), packet_LPCSTR, packet_const_char_star) != -1) {
+		    PCAP_VERSION_STRING " (packet.dll version %s)",
+		    PacketGetVersion()) != -1) {
 			/* Success */
 			pcap_lib_version_string = full_pcap_version_string;
 		}
diff --git a/pcap.c b/pcap.c
index c3df7104..58ef71d2 100644
--- a/pcap.c
+++ b/pcap.c
@@ -130,20 +130,6 @@ struct rtentry;		/* declarations in <net/if.h> */
 #endif
 
 #ifdef _WIN32
-LPCSTR
-PacketGetLPCSTR(void)
-{
-	return "LPCSTR";
-}
-
-const char *
-PacketGetConstCharStar(void)
-{
-	return "const char *";
-}
-#endif
-
-#ifdef _WIN32
 /*
  * DllMain(), required when built as a Windows DLL.
  *