Skip to content

Commit

Permalink
Fix some issues on the Linux side that were brought up from building …
Browse files Browse the repository at this point in the history
…on Windows
  • Loading branch information
cnlohr committed Sep 27, 2019
1 parent 4475270 commit 73d1780
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions ping.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
1 change: 0 additions & 1 deletion rawdraw/CNFGXDriver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
{
Expand Down

0 comments on commit 73d1780

Please sign in to comment.