StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

toxav renaming: group.{h,c} -> groupav.{h,c}

Browse Source 
toxav file for "group" conflicts with toxcore "group" file. While this
works fine in almost all cases, Xcode on macOS is confused with that.
This commit is contained in:
Dmytro Vorobiov 2016-10-28 22:11:48 +02:00
parent de966cdf90
commit 59d27e6d94
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -225,8 +225,8 @@ if(BUILD_TOXAV)
toxav/audio.h toxav/audio.h
toxav/bwcontroller.c toxav/bwcontroller.c
toxav/bwcontroller.h toxav/bwcontroller.h
toxav/group.c toxav/groupav.c
toxav/group.h toxav/groupav.h
toxav/msi.c toxav/msi.c
toxav/msi.h toxav/msi.h
toxav/ring_buffer.c toxav/ring_buffer.c

4
toxav/Makefile.inc
View File

@ -8,8 +8,8 @@ libtoxav_la_SOURCES = ../toxav/rtp.h \
../toxav/rtp.c \ ../toxav/rtp.c \
../toxav/msi.h \ ../toxav/msi.h \
../toxav/msi.c \ ../toxav/msi.c \
../toxav/group.h \ ../toxav/groupav.h \
../toxav/group.c \ ../toxav/groupav.c \
../toxav/audio.h \ ../toxav/audio.h \
../toxav/audio.c \ ../toxav/audio.c \
../toxav/video.h \ ../toxav/video.h \

2
toxav/group.c → toxav/groupav.c
View File

@ -22,7 +22,7 @@
#include "config.h" #include "config.h"
#endif /* HAVE_CONFIG_H */ #endif /* HAVE_CONFIG_H */
#include "group.h" #include "groupav.h"
#include "../toxcore/logger.h" #include "../toxcore/logger.h"
#include "../toxcore/util.h" #include "../toxcore/util.h"

0
toxav/group.h → toxav/groupav.h
View File

2
toxav/toxav_old.c
View File

@ -24,7 +24,7 @@
#include "toxav.h" #include "toxav.h"
#include "group.h" #include "groupav.h"
/* Create a new toxav group. /* Create a new toxav group.
* *