[GNUnet-SVN] [gnunet] branch master updated (3aa0118c5 -> 525f99f91)

[gnunet]

This is an automated email from the git hooks/post-receive script.

lrn pushed a change to branch master
in repository gnunet.

    from 3aa0118c5 update ignore file
     new fe35e1bc5 ntohl() return value casts for the testsuite on W32
     new e4493604c Try to fix FTBFS
     new fea058a52 Change helper libraries to be noinst_LTLIBTRARIES
     new 6823f671f Hack gnunet_gst_def.h to allow it compile on W32
     new 525f99f91 Disable test_client_unix.nc test on W32

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/cadet/Makefile.am                          | 18 +++++++++---------
 src/conversation/gnunet_gst_def.h              | 11 +++++++----
 src/transport/test_transport_address_switch.c  |  2 +-
 src/transport/test_transport_api_reliability.c | 12 ++++++------
 src/util/Makefile.am                           |  5 ++++-
 5 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/cadet/Makefile.am b/src/cadet/Makefile.am
index 3cf92c349..b52079b2e 100644
--- a/src/cadet/Makefile.am
+++ b/src/cadet/Makefile.am
@@ -110,13 +110,13 @@ endif
 
 
 if HAVE_TESTING
- noinst_LIBRARIES = libgnunetcadettest.a libgnunetcadettestnew.a 
$(noinst_LIB_EXP)
+ noinst_LTLIBRARIES = libgnunetcadettest.la libgnunetcadettestnew.la 
$(noinst_LIB_EXP)
  noinst_PROGRAMS = gnunet-cadet-profiler
 endif
 
-libgnunetcadettest_a_SOURCES = \
+libgnunetcadettest_la_SOURCES = \
   cadet_test_lib.c cadet_test_lib.h
-libgnunetcadettest_a_LIBADD = \
+libgnunetcadettest_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
  libgnunetcadet.la
@@ -164,14 +164,14 @@ endif
 ld_cadet_test_lib = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  libgnunetcadettest.a \
+  libgnunetcadettest.la \
   libgnunetcadet.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 dep_cadet_test_lib = \
   libgnunetcadet.la \
-  libgnunetcadettest.a \
+  libgnunetcadettest.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 
@@ -263,9 +263,9 @@ test_cadet_5_speed_reliable_backwards_LDADD = 
$(ld_cadet_test_lib)
 
 
 # NEW TESTS
-libgnunetcadettestnew_a_SOURCES = \
+libgnunetcadettestnew_la_SOURCES = \
   cadet_test_lib_new.c cadet_test_lib_new.h
-libgnunetcadettestnew_a_LIBADD = \
+libgnunetcadettestnew_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
  libgnunetcadetnew.la
@@ -274,12 +274,12 @@ ld_cadet_test_lib_new = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   libgnunetcadetnew.la \
-  libgnunetcadettestnew.a \
+  libgnunetcadettestnew.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 dep_cadet_test_lib_new = \
   libgnunetcadetnew.la \
-  libgnunetcadettestnew.a \
+  libgnunetcadettestnew.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_cadet_2_forward_new_SOURCES = \
diff --git a/src/conversation/gnunet_gst_def.h 
b/src/conversation/gnunet_gst_def.h
index 9f519b564..85add54b6 100644
--- a/src/conversation/gnunet_gst_def.h
+++ b/src/conversation/gnunet_gst_def.h
@@ -65,20 +65,23 @@
 #include <gst/app/gstappsink.h>
 
 // sockets
+#ifndef MINGW
+#if HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 #include <sys/socket.h>
-#include <fcntl.h>
 #include <arpa/inet.h>
+#include <netdb.h>
+#endif
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
+#include <fcntl.h>
 
 
 //glib stuff
 //#include <glib.h>
 #include <glib-2.0/glib/gprintf.h>
-#include <glib-unix.h>
+//#include <glib-unix.h>
 
 // static struct AudioMessage *audio_message;
 
diff --git a/src/transport/test_transport_address_switch.c 
b/src/transport/test_transport_address_switch.c
index 33b0f2d14..e076d3501 100644
--- a/src/transport/test_transport_address_switch.c
+++ b/src/transport/test_transport_address_switch.c
@@ -301,7 +301,7 @@ notify_receive (void *cls,
                 "Peer %u (`%s') got message %u of size %u from peer (`%s')\n",
                 receiver->no,
                 ps,
-                ntohl (hdr->num),
+                (uint32_t) ntohl (hdr->num),
                 ntohs (hdr->header.size),
                 GNUNET_i2s (sender));
     GNUNET_free (ps);
diff --git a/src/transport/test_transport_api_reliability.c 
b/src/transport/test_transport_api_reliability.c
index d6702cc25..375a935c8 100644
--- a/src/transport/test_transport_api_reliability.c
+++ b/src/transport/test_transport_api_reliability.c
@@ -91,7 +91,7 @@ get_size (unsigned int iter)
 #ifndef LINUX
   /* FreeBSD/OSX etc. Unix DGRAMs do not work
    * with large messages */
-  if (0 == strcmp ("unix", test_plugin))
+  if (0 == strcmp ("unix", ccc->test_plugin))
     ret = sizeof (struct GNUNET_TRANSPORT_TESTING_TestMessage) + (ret % 1024);
 #endif
   ret = sizeof (struct GNUNET_TRANSPORT_TESTING_TestMessage) + (ret % 60000);
@@ -228,10 +228,10 @@ notify_receive (void *cls,
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Expected message %u of size %u, got %u bytes of message %u\n",
-                ntohl (hdr->num),
+                (uint32_t) ntohl (hdr->num),
                 s,
                 ntohs (hdr->header.size),
-                ntohl (hdr->num));
+                (uint32_t) ntohl (hdr->num));
     ccc->global_ret = GNUNET_SYSERR;
     GNUNET_SCHEDULER_shutdown ();
     return;
@@ -247,7 +247,7 @@ notify_receive (void *cls,
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Expected message %u with bits %u, but body did not match\n",
-                ntohl (hdr->num),
+                (uint32_t) ntohl (hdr->num),
                 (unsigned char) ntohl (hdr->num));
     ccc->global_ret = GNUNET_SYSERR;
     GNUNET_SCHEDULER_shutdown ();
@@ -258,7 +258,7 @@ notify_receive (void *cls,
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Got message %u of size %u\n",
-                ntohl (hdr->num),
+                (uint32_t) ntohl (hdr->num),
                 ntohs (hdr->header.size));
   }
 #endif
@@ -267,7 +267,7 @@ notify_receive (void *cls,
   {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Message id %u is bigger than maxmimum number of messages %u 
expected\n",
-                  ntohl (hdr->num),
+                  (uint32_t) ntohl (hdr->num),
                   TOTAL_MSGS / xhdr);
   }
   if (0 == (n % (TOTAL_MSGS / xhdr / 100)))
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index ac125fb66..df319fe77 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -31,6 +31,9 @@ endif
 
 if !MINGW
  SERVER_CLIENT_UNIX = test_server_with_client_unix
+ TEST_CLIENT_UNIC_NC = test_client_unix.nc
+else
+ TEST_CLIENT_UNIC_NC =
 endif
 
 if USE_COVERAGE
@@ -266,7 +269,7 @@ endif
 check_PROGRAMS = \
  test_bio \
  test_client.nc \
- test_client_unix.nc \
+ $(TEST_CLIENT_UNIX_NC) \
  $(SSH_USING_TESTS) \
  test_common_allocation \
  test_common_endian \

-- 
To stop receiving notification emails like this one, please contact
address@hidden