Fix some issues on the Linux side that were brought up from building …

…on Windows
cntools · Sep 27, 2019 · 73d1780 · 73d1780
1 parent 4475270
commit 73d1780
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -27,7 +27,7 @@ cnping : cnping.o rawdraw/CNFGFunctions.o rawdraw/CNFGXDriver.o ping.o httping.o
 cnping_mac : cnping.c rawdraw/CNFGFunctions.c rawdraw/CNFGCocoaCGDriver.m ping.c httping.o
 	$(CC) -o cnping $^ -x objective-c -framework Cocoa -framework QuartzCore -lm -lpthread
 
-searchnet : rawdraw/os_generic.o ping.o searchnet.o
+searchnet : ping.o searchnet.o
 	$(CC) $(CFLAGS) -o $@ $^ -lpthread
 
 linuxinstall : cnping

diff --git a/ping.c b/ping.c
@@ -179,6 +179,9 @@ void ping(struct sockaddr_in *addr )
 	#include <netinet/ip.h>
 	#include <netinet/ip_icmp.h>
 #endif
+
+#include "rawdraw/os_generic.h"
+
 #if defined WIN32 || defined __APPLE__
 struct icmphdr
 {

diff --git a/rawdraw/CNFGXDriver.c b/rawdraw/CNFGXDriver.c
@@ -378,7 +378,6 @@ void CNFGUpdateScreenWithBitmap( unsigned long * data, int w, int h )
 	static XImage *xi;
 	static int depth;
 	static int lw, lh;
-	static unsigned char * lbuffer;
 
 	if( !xi )
 	{