Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 15:13:02 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #53 from JFreegman/master

Browse Source 
fix cflags
This commit is contained in:
JFreegman 2013-11-15 18:53:06 -08:00
commit 99b16e3af1
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
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

2
build/Makefile.am
View File

@ -23,7 +23,7 @@ toxic_SOURCES = $(top_srcdir)/src/main.c \
$(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 = -I$(top_srcdir) \
$(NCURSES_CFLAGS) \ $(NCURSES_CFLAGS) \
$(LIBSODIUM_CFLAGS) \ $(LIBSODIUM_CFLAGS) \
$(LIBTOXCORE_CFLAGS) $(LIBTOXCORE_CFLAGS)

1
src/friendlist.h
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 */

2
src/main.c
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)) {