Merge branch 'fix/FreeBSD-compile-error'

Conflicts:
	config.mk

diff --cc config.mk
Simple merge

diff --cc src/main.h
Simple merge

diff --cc src/session.c
index 8b217c5,b42f697..4e4f7be
--- 1/src/session.c
--- 2/src/session.c
+++ b/src/session.c
@@@ -89,16 -88,16 +88,16 @@@ static void cookiejar_changed(SoupCooki
          soup_date_free(expire);
      }
      SOUP_COOKIE_JAR_CLASS(cookiejar_parent_class)->changed(self, old_cookie, new_cookie);
-     flock(COOKIEJAR(self)->lock, LOCK_UN);
+     FLOCK(COOKIEJAR(self)->lock, F_UNLCK);
  }
  
 -static void cookiejar_class_init(CookieJarClass *class)
 +static void cookiejar_class_init(CookieJarClass *klass)
  {
 -    SOUP_COOKIE_JAR_CLASS(class)->changed = cookiejar_changed;
 -    G_OBJECT_CLASS(class)->get_property   = G_OBJECT_CLASS(cookiejar_parent_class)->get_property;
 -    G_OBJECT_CLASS(class)->set_property   = cookiejar_set_property;
 -    G_OBJECT_CLASS(class)->finalize       = cookiejar_finalize;
 -    g_object_class_override_property(G_OBJECT_CLASS(class), 1, "filename");
 +    SOUP_COOKIE_JAR_CLASS(klass)->changed = cookiejar_changed;
 +    G_OBJECT_CLASS(klass)->get_property   = G_OBJECT_CLASS(cookiejar_parent_class)->get_property;
 +    G_OBJECT_CLASS(klass)->set_property   = cookiejar_set_property;
 +    G_OBJECT_CLASS(klass)->finalize       = cookiejar_finalize;
 +    g_object_class_override_property(G_OBJECT_CLASS(klass), 1, "filename");
  }
  
  static void cookiejar_finalize(GObject *self)