[GNUnet-SVN] r8642 - in gnunet: m4 src/datastore src/util

[gnunet]

Author: grothoff
Date: 2009-07-08 12:47:39 -0600 (Wed, 08 Jul 2009)
New Revision: 8642

Modified:
   gnunet/m4/libtool.m4
   gnunet/m4/ltdl.m4
   gnunet/src/datastore/gnunet-service-datastore.c
   gnunet/src/util/client.c
Log:
fixing types

Modified: gnunet/m4/libtool.m4
===================================================================
--- gnunet/m4/libtool.m4        2009-07-07 23:21:40 UTC (rev 8641)
+++ gnunet/m4/libtool.m4        2009-07-08 18:47:39 UTC (rev 8642)
@@ -2485,18 +2485,6 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix 
${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -3088,7 +3076,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd* | netbsdelf*-gnu)
+netbsd*)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern 
/lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
@@ -3769,7 +3757,7 @@
            ;;
        esac
        ;;
-      netbsd* | netbsdelf*-gnu)
+      netbsd*)
        ;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4194,9 +4182,6 @@
   cygwin* | mingw* | cegcc*)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | 
$global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 
DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ 
]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
-  linux* | k*bsd*-gnu)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-  ;;
   *)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | 
$global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
@@ -4261,9 +4246,6 @@
   openbsd*)
     with_gnu_ld=no
     ;;
-  linux* | k*bsd*-gnu)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
   esac
 
   _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4446,7 +4428,7 @@
       fi
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
        _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs 
$linker_flags -o $lib'
        wlarc=
@@ -4621,7 +4603,6 @@
        if test "$aix_use_runtimelinking" = yes; then
          shared_flag="$shared_flag "'${wl}-G'
        fi
-       _LT_TAGVAR(link_all_deplibs, $1)=no
       else
        # not using gcc
        if test "$host_cpu" = ia64; then
@@ -4860,7 +4841,7 @@
       _LT_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
        _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs 
$linker_flags'  # a.out
       else

Modified: gnunet/m4/ltdl.m4
===================================================================
--- gnunet/m4/ltdl.m4   2009-07-07 23:21:40 UTC (rev 8641)
+++ gnunet/m4/ltdl.m4   2009-07-08 18:47:39 UTC (rev 8642)
@@ -487,7 +487,7 @@
     # at 6.2 and later dlopen does load deplibs.
     lt_cv_sys_dlopen_deplibs=yes
     ;;
-  netbsd* | netbsdelf*-gnu)
+  netbsd*)
     lt_cv_sys_dlopen_deplibs=yes
     ;;
   openbsd*)

Modified: gnunet/src/datastore/gnunet-service-datastore.c
===================================================================
--- gnunet/src/datastore/gnunet-service-datastore.c     2009-07-07 23:21:40 UTC 
(rev 8641)
+++ gnunet/src/datastore/gnunet-service-datastore.c     2009-07-08 18:47:39 UTC 
(rev 8642)
@@ -336,7 +336,7 @@
               uint32_t priority,
               uint32_t anonymity,
               struct GNUNET_TIME_Absolute
-              expiration, unsigned long long uid)
+              expiration, uint64_t uid)
 {
   struct GNUNET_SERVER_Client *client = cls;
   struct GNUNET_MessageHeader *end;
@@ -644,7 +644,7 @@
                 uint32_t priority,
                 uint32_t anonymity,
                 struct GNUNET_TIME_Absolute
-                expiration, unsigned long long uid)
+                expiration, uint64_t uid)
 {
   struct RemoveContext *rc = cls;
   if (key == NULL)

Modified: gnunet/src/util/client.c
===================================================================
--- gnunet/src/util/client.c    2009-07-07 23:21:40 UTC (rev 8641)
+++ gnunet/src/util/client.c    2009-07-08 18:47:39 UTC (rev 8642)
@@ -103,7 +103,7 @@
   /**
    * Size of received_buf.
    */
-  size_t received_size;
+  unsigned int received_size;
 
   /**
    * Do we have a complete response in received_buf?