Merge from Artem's fork

.gitignore

@@ -4,14 +4,12 @@ ref/*
 *.exe
 dsm
 *.so
-*.a
 dsm_discover
 dsm_lookup
 dsm_inverse
 configure
 .*/
-build*/
-*.a
+build/
 *.deps
 *.la
 *.libs
@@ -26,7 +24,12 @@ build*/
 aclocal.m4
 autom4te.cache
 config
-config.*
+config.rb
+config.h.*
+config.s*
+config.log
+config.guess
+universal/*.a
 config.h.in
 configure
 libtool

bin/discover.c

@@ -90,6 +90,7 @@ int main()
   getchar();
 
   netbios_ns_discover_stop(ns);
+  netbios_ns_destroy(ns);
 
   return 0;
 }

compat/clock_gettime.c

@@ -38,7 +38,7 @@
 #include <sched.h>
 #include "compat.h"
 
-int clock_gettime(clockid_t clk_id, struct timespec *tp) {
+int dsm_clock_gettime(clockid_t clk_id, struct timespec *tp) {
     kern_return_t   ret;
     clock_serv_t    clk;
     clock_id_t clk_serv_id;
@@ -67,7 +67,7 @@ int clock_gettime(clockid_t clk_id, struct timespec *tp) {
 #include <time.h>
 #include "compat.h"
 
-int clock_gettime(int clk_id, struct timespec *spec) {
+int dsm_clock_gettime(int clk_id, struct timespec *spec) {
     (void)clk_id;
     FILETIME wintime;
     GetSystemTimeAsFileTime(&wintime);

compat/compat.c

@@ -1,4 +1,4 @@
-#include "config.h"
+#include "../xcode/config.h"
 
 #if !defined(HAVE_PIPE) && defined(HAVE__PIPE)
 

compat/compat.h

@@ -28,9 +28,14 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "config.h"
+#include "../xcode/config.h"
 
 #include <stdlib.h>
+
+#ifndef _WIN32
+#include <sys/time.h>
+#endif
+
 #if !defined HAVE_STRLCPY && !defined HAVE_LIBBSD
 size_t strlcpy(char *dst, const char *src, size_t siz);
 #endif
@@ -47,7 +52,7 @@ enum {
 };
 #endif
 #if !defined HAVE_CLOCK_GETTIME
-int clock_gettime(clockid_t clk_id, struct timespec *tp);
+int dsm_clock_gettime(clockid_t clk_id, struct timespec *tp);
 #endif
 
 #if !defined HAVE_STRNDUP