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

diff --cc gsoc_sntp/networking.h
index 1dccf310e4ae5b03e0f6638f651253efd7b5a536,9dab79c56b33fb8367cfc6271c13e3a416d743e0..9da494de7dd62f8bf2e4b86a59a28c24c89141cd
--- 1/gsoc_sntp/networking.h
--- 2/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 */