Work around stupid excessively strict warning in GCC 4.4.

[disorder] / clients / playrtp-mem.c

diff --git a/clients/playrtp-mem.c b/clients/playrtp-mem.c
index e101978bad0aafaa7bbabe73fe73ff9aafac7400..ce45c9c953ed324920ad9d39f1d65def97536298 100644 (file)
--- a/clients/playrtp-mem.c
+++ b/clients/playrtp-mem.c
@@ -2,31 +2,26 @@
  * This file is part of DisOrder.
  * Copyright (C) 2007 Richard Kettlewell
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file clients/playrtp-mem.c
  * @brief RTP player memory management
  */
 
-#include <config.h>
-#include "types.h"
+#include "common.h"
 
 #include <pthread.h>
-#include <assert.h>
-#include <string.h>
 
 #include "mem.h"
 #include "vector.h"
@@ -63,7 +58,7 @@ static size_t count_free_packets;
 static pthread_mutex_t mem_lock = PTHREAD_MUTEX_INITIALIZER;
 
 /** @brief Return a new packet */
-struct packet *new_packet(void) {
+struct packet *playrtp_new_packet(void) {
   struct packet *p;
   
   pthread_mutex_lock(&mem_lock);
@@ -83,7 +78,7 @@ struct packet *new_packet(void) {
 }
 
 /** @brief Free a packet */
-void free_packet(struct packet *p) {
+void playrtp_free_packet(struct packet *p) {
   union free_packet *u = (union free_packet *)p;
   pthread_mutex_lock(&mem_lock);
   u->next = free_packets;