diff options
author | GDR! <gdr@gdr.name> | 2014-12-22 00:52:27 +0000 |
---|---|---|
committer | GDR! <gdr@gdr.name> | 2014-12-22 00:52:27 +0000 |
commit | 1fb0fae11b2d129dd380b6413e5e81d461c8806d (patch) | |
tree | b13dfaaed7a132c74d8c70b5f7c5222508697ad0 | |
parent | 4f28d0b194fdd9607955f2e32de44f8fbf5d7d31 (diff) |
Trying to make the calling convention problem go away
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | main.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -1,7 +1,7 @@ | |||
1 | SOURCES = $(wildcard *.c) | 1 | SOURCES = $(wildcard *.c) |
2 | DEPS=libtoxcore | 2 | DEPS=libtoxcore |
3 | CC=gcc | 3 | CC=gcc |
4 | CFLAGS=-g #-std=c99 | 4 | CFLAGS=-g -O2 #-std=c99 |
5 | CFLAGS += $(shell pkg-config --cflags $(DEPS)) | 5 | CFLAGS += $(shell pkg-config --cflags $(DEPS)) |
6 | LDFLAGS=-g -pthread -lm -static -lrt | 6 | LDFLAGS=-g -pthread -lm -static -lrt |
7 | LDFLAGS += $(shell pkg-config --libs $(DEPS)) | 7 | LDFLAGS += $(shell pkg-config --libs $(DEPS)) |
@@ -494,11 +494,13 @@ int parse_lossless_packet(void *sender_uc, const uint8_t *data, uint32_t len) | |||
494 | return -1; | 494 | return -1; |
495 | } | 495 | } |
496 | 496 | ||
497 | /* | ||
497 | if(!data) | 498 | if(!data) |
498 | { | 499 | { |
499 | fprintf(stderr, "Got NULL pointer from toxcore - WTF?\n"); | 500 | fprintf(stderr, "Got NULL pointer from toxcore - WTF?\n"); |
500 | return -1; | 501 | return -1; |
501 | } | 502 | } |
503 | */ | ||
502 | 504 | ||
503 | if(data[0] != PROTOCOL_MAGIC_HIGH || data[1] != PROTOCOL_MAGIC_LOW) | 505 | if(data[0] != PROTOCOL_MAGIC_HIGH || data[1] != PROTOCOL_MAGIC_LOW) |
504 | { | 506 | { |