Merge of trunk into branch 1.6.x.

git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/branches/branch-1.6.x@339 119443c7-1b9e-41f8-b6fc-b9c35fce742c
This commit is contained in:
Marcelo Roberto Jimenez
2008-03-25 10:21:08 +00:00
parent 1c9632dcc3
commit 4b40e94b03
46 changed files with 2964 additions and 334 deletions

View File

@@ -30,11 +30,13 @@
///////////////////////////////////////////////////////////////////////////
#include "LinkedList.h"
#include <sys/param.h>
#ifndef WIN32
#include <sys/param.h>
#endif
#if (defined(BSD) && BSD >= 199306) || defined(__OSX__) || defined(__APPLE__)
#include <stdlib.h>
#include <stdlib.h>
#else
#include <malloc.h>
#include <malloc.h>
#endif
#include <assert.h>
@@ -532,3 +534,4 @@ ListSize( LinkedList * list )
return list->size;
}