1
0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-26 22:53:28 +01:00

cflags were doing nothing

This commit is contained in:
Jfreegman 2013-11-15 21:36:05 -05:00
parent 40b79f5e69
commit e9ef2b1fc6
4 changed files with 4 additions and 6 deletions

View File

@ -1,5 +1,3 @@
SUBDIRS = build misc SUBDIRS = build misc
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
AM_CFLAGS = -wall -c89 -werror

View File

@ -15,15 +15,14 @@ toxic_SOURCES = $(top_srcdir)/src/main.c \
$(top_srcdir)/src/groupchat.c \ $(top_srcdir)/src/groupchat.c \
$(top_srcdir)/src/groupchat.h \ $(top_srcdir)/src/groupchat.h \
$(top_srcdir)/src/global_commands.c \ $(top_srcdir)/src/global_commands.c \
$(top_srcdir)/src/global_commands.h \
$(top_srcdir)/src/chat_commands.c \ $(top_srcdir)/src/chat_commands.c \
$(top_srcdir)/src/chat_commands.h \
$(top_srcdir)/src/execute.c \ $(top_srcdir)/src/execute.c \
$(top_srcdir)/src/execute.h \ $(top_srcdir)/src/execute.h \
$(top_srcdir)/src/misc_tools.c \ $(top_srcdir)/src/misc_tools.c \
$(top_srcdir)/src/misc_tools.h $(top_srcdir)/src/misc_tools.h
toxic_CFLAGS = -I$(top_srcdir) \ toxic_CFLAGS = -Werror \
-I$(top_srcdir) \
$(NCURSES_CFLAGS) \ $(NCURSES_CFLAGS) \
$(LIBSODIUM_CFLAGS) \ $(LIBSODIUM_CFLAGS) \
$(LIBTOXCORE_CFLAGS) $(LIBTOXCORE_CFLAGS)

View File

@ -7,5 +7,6 @@
ToxWindow new_friendlist(); ToxWindow new_friendlist();
void disable_chatwin(int f_num); void disable_chatwin(int f_num);
int get_friendnum(uint8_t *name); int get_friendnum(uint8_t *name);
void sort_friendlist_index(void);
#endif /* end of include guard: FRIENDLIST_H_53I41IM */ #endif /* end of include guard: FRIENDLIST_H_53I41IM */

View File

@ -230,7 +230,7 @@ static void do_tox(Tox *m, ToxWindow *prompt)
if (!dht_on && !tox_isconnected(m) && !(conn_try++ % 100)) { if (!dht_on && !tox_isconnected(m) && !(conn_try++ % 100)) {
if (!conn_err) { if (!conn_err) {
wprintw(prompt->window, "Establishing connection...\n"); 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); wprintw(prompt->window, "\nAuto-connect failed with error code %d\n", conn_err);
} }
} else if (!dht_on && tox_isconnected(m)) { } else if (!dht_on && tox_isconnected(m)) {