aboutsummaryrefslogtreecommitdiff
path: root/buffer.c
diff options
context:
space:
mode:
authorDavid Sommerseth <dazo@users.sourceforge.net>2010-11-18 22:17:58 +0100
committerDavid Sommerseth <dazo@users.sourceforge.net>2010-11-18 22:17:58 +0100
commit529df9922d85574828d95020eebcd228ba3a8164 (patch)
tree8524b46dd4bbbd163d4ce273ea6e82edd7c4b947 /buffer.c
parentMerge branch 'bugfix2.1' into beta2.2 (diff)
parentMerged add_bypass_address() and add_host_route_if_nonlocal() (diff)
downloadopenvpn-529df9922d85574828d95020eebcd228ba3a8164.tar.xz
Merge branch 'feat_misc' into beta2.2
Conflicts: acinclude.m4 config-win32.h configure.ac misc.c thread.c thread.h - These conflicts was mainly due to feat_misc getting old and mostly caused by the pthread clean-up patches in feat_misc Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Diffstat (limited to 'buffer.c')
-rw-r--r--buffer.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/buffer.c b/buffer.c
index 5108429..947df90 100644
--- a/buffer.c
+++ b/buffer.c
@@ -28,7 +28,6 @@
#include "buffer.h"
#include "error.h"
#include "mtu.h"
-#include "thread.h"
#include "memdbg.h"
@@ -299,10 +298,8 @@ gc_malloc (size_t size, bool clear, struct gc_arena *a)
#endif
check_malloc_return (e);
ret = (char *) e + sizeof (struct gc_entry);
- /*mutex_lock_static (L_GC_MALLOC);*/
e->next = a->list;
a->list = e;
- /*mutex_unlock_static (L_GC_MALLOC);*/
}
else
{
@@ -324,10 +321,8 @@ void
x_gc_free (struct gc_arena *a)
{
struct gc_entry *e;
- /*mutex_lock_static (L_GC_MALLOC);*/
e = a->list;
a->list = NULL;
- /*mutex_unlock_static (L_GC_MALLOC);*/
while (e != NULL)
{