Merge branch 'av-fix' of https://github.com/nurupo/InsertProjectNameHere into nurupo-av-fix

8 files changed, 9 insertions, 16 deletions

diff --git a/toxav/event.c b/toxav/event.c
index 870abf2a..3916b744 100644
--- a/toxav/event.c
+++ b/toxav/event.c
@@ -17,8 +17,6 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Tox. If not, see <http://www.gnu.org/licenses/>.
  *
- *
- *   Report bugs/suggestions at #tox-dev @ freenode.net:6667
  */
 
 
diff --git a/toxav/event.h b/toxav/event.h
index f9e67543..e8bc5e37 100644
--- a/toxav/event.h
+++ b/toxav/event.h
@@ -17,8 +17,6 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Tox. If not, see <http://www.gnu.org/licenses/>.
  *
- *
- *   Report bugs/suggestions at #tox-dev @ freenode.net:6667
  */
 
 
diff --git a/toxav/msi.c b/toxav/msi.c
index eba0164a..6105c8f1 100644
--- a/toxav/msi.c
+++ b/toxav/msi.c
@@ -17,8 +17,6 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Tox. If not, see <http://www.gnu.org/licenses/>.
  *
- *
- *   Report bugs/suggestions at #tox-dev @ freenode.net:6667
  */
 
 
diff --git a/toxav/msi.h b/toxav/msi.h
index 042f3f0f..fdf0a88c 100644
--- a/toxav/msi.h
+++ b/toxav/msi.h
@@ -17,8 +17,6 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Tox. If not, see <http://www.gnu.org/licenses/>.
  *
- *
- *   Report bugs/suggestions at #tox-dev @ freenode.net:6667
  */
 
 #ifndef __TOXMSI
diff --git a/toxav/rtp.c b/toxav/rtp.c
index d4fdf656..8cead4c9 100644
--- a/toxav/rtp.c
+++ b/toxav/rtp.c
@@ -17,8 +17,6 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Tox. If not, see <http://www.gnu.org/licenses/>.
  *
- *
- *   Report bugs/suggestions at #tox-dev @ freenode.net:6667
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/toxav/rtp.h b/toxav/rtp.h
index 45cf83b6..f4f3944d 100644
--- a/toxav/rtp.h
+++ b/toxav/rtp.h
@@ -17,8 +17,6 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Tox. If not, see <http://www.gnu.org/licenses/>.
  *
- *
- *   Report bugs/suggestions at #tox-dev @ freenode.net:6667
  */
 
 #ifndef __TOXRTP
diff --git a/toxav/toxav.c b/toxav/toxav.c
index a042b9dd..7b9aeaef 100644
--- a/toxav/toxav.c
+++ b/toxav/toxav.c
@@ -17,8 +17,6 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Tox. If not, see <http://www.gnu.org/licenses/>.
  *
- *
- *   Report bugs/suggestions at #tox-dev @ freenode.net:6667
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/toxav/toxav.h b/toxav/toxav.h
index 4d988962..35fe764e 100644
--- a/toxav/toxav.h
+++ b/toxav/toxav.h
@@ -17,8 +17,6 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Tox. If not, see <http://www.gnu.org/licenses/>.
  *
- *
- *   Report bugs/suggestions at #tox-dev @ freenode.net:6667
  */
 
 
@@ -26,6 +24,10 @@
 #define __TOXAV
 #include <inttypes.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* vpx_image_t */
 #include <vpx/vpx_image.h>
 
@@ -370,4 +372,9 @@ int toxav_set_video_queue_limit ( ToxAv *av, int32_t call_index, uint64_t limit
 
 
 Tox *toxav_get_tox(ToxAv *av);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __TOXAV */
\ No newline at end of file