From: Johannes Maximilian Kuehn <kuehn@ntp.org>
Date: Thu, 24 Jul 2008 06:56:20 +0000 (+0900)
Subject: Merge kuehn@pogo.udel.edu:/pogo/users/stenn/ntp-dev-kuehn/
X-Git-Tag: NTP_4_2_5P142~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3bcd746ac241a38a9684c873a7cc13e4e72bad5;p=thirdparty%2Fntp.git

Merge kuehn@pogo.udel.edu:/pogo/users/stenn/ntp-dev-kuehn/
into  yumi.mxiesoft.com:/geom_mobile/home/Amidamaru/projects/sntp/repo/ntp-dev

bk: 48882794kQgPckgpvuQCGNVm435coA
---

b3bcd746ac241a38a9684c873a7cc13e4e72bad5
diff --cc gsoc_sntp/networking.h
index 1dccf310e,9dab79c56..9da494de7
--- a/gsoc_sntp/networking.h
+++ b/gsoc_sntp/networking.h
@@@ -12,12 -10,14 +10,14 @@@
  #include <string.h>
  #include <errno.h>
  
+ #include "data_formats.h"
+ 
  /* FIXME, see portability issue 1 */ /* irrelevant for now */
  #ifndef SYS_WINNT
 -# define SOCKET	int
 -# define INVALID_SOCKET	-1
 -# define SOCKET_ERROR	-1
 -# define closesocket close
 +#define SOCKET	int
 +#define INVALID_SOCKET	-1
 +#define SOCKET_ERROR	-1
 +#define closesocket close
  #endif
  
  /* Check if necessary or not */