From e9ef2b1fc61407b0a363194681afd6be853dc9c4 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Fri, 15 Nov 2013 21:36:05 -0500 Subject: [PATCH] cflags were doing nothing --- Makefile.am | 2 -- build/Makefile.am | 5 ++--- src/friendlist.h | 1 + src/main.c | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5cc1266..2b300dc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,3 @@ SUBDIRS = build misc ACLOCAL_AMFLAGS = -I m4 - -AM_CFLAGS = -wall -c89 -werror diff --git a/build/Makefile.am b/build/Makefile.am index 583ebca..476a8a4 100644 --- a/build/Makefile.am +++ b/build/Makefile.am @@ -15,15 +15,14 @@ toxic_SOURCES = $(top_srcdir)/src/main.c \ $(top_srcdir)/src/groupchat.c \ $(top_srcdir)/src/groupchat.h \ $(top_srcdir)/src/global_commands.c \ - $(top_srcdir)/src/global_commands.h \ $(top_srcdir)/src/chat_commands.c \ - $(top_srcdir)/src/chat_commands.h \ $(top_srcdir)/src/execute.c \ $(top_srcdir)/src/execute.h \ $(top_srcdir)/src/misc_tools.c \ $(top_srcdir)/src/misc_tools.h -toxic_CFLAGS = -I$(top_srcdir) \ +toxic_CFLAGS = -Werror \ + -I$(top_srcdir) \ $(NCURSES_CFLAGS) \ $(LIBSODIUM_CFLAGS) \ $(LIBTOXCORE_CFLAGS) diff --git a/src/friendlist.h b/src/friendlist.h index d925aea..ceccddb 100644 --- a/src/friendlist.h +++ b/src/friendlist.h @@ -7,5 +7,6 @@ ToxWindow new_friendlist(); void disable_chatwin(int f_num); int get_friendnum(uint8_t *name); +void sort_friendlist_index(void); #endif /* end of include guard: FRIENDLIST_H_53I41IM */ diff --git a/src/main.c b/src/main.c index 0eb141c..efb9ca1 100644 --- a/src/main.c +++ b/src/main.c @@ -230,7 +230,7 @@ static void do_tox(Tox *m, ToxWindow *prompt) if (!dht_on && !tox_isconnected(m) && !(conn_try++ % 100)) { if (!conn_err) { wprintw(prompt->window, "Establishing connection...\n"); - if (conn_err = init_connection(m)) + if ((conn_err = init_connection(m))) wprintw(prompt->window, "\nAuto-connect failed with error code %d\n", conn_err); } } else if (!dht_on && tox_isconnected(m)) {