summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2009-07-08 18:47:39 +0000
committerChristian Grothoff <christian@grothoff.org>2009-07-08 18:47:39 +0000
commite1e86e290710ab2f953d62a504feebdf8ddfe56f (patch)
tree5d85670e26138b16fc840396d0e67e4fcad9753e
parent9ff5a5b4713dfefc3b42b66fb3865b1435667a77 (diff)
fixing types
-rw-r--r--m4/libtool.m427
-rw-r--r--m4/ltdl.m42
-rw-r--r--src/datastore/gnunet-service-datastore.c4
-rw-r--r--src/util/client.c2
4 files changed, 8 insertions, 27 deletions
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 1e7ea47c0..39ba996cb 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -2485,18 +2485,6 @@ linux* | k*bsd*-gnu)
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 @@ linux* | k*bsd*-gnu)
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 @@ m4_if([$1], [CXX], [
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4194,9 +4182,6 @@ m4_if([$1], [CXX], [
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 @@ dnl Note also adjust exclude_expsyms for C++ above.
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 @@ _LT_EOF
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 @@ _LT_EOF
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_EOF
_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
diff --git a/m4/ltdl.m4 b/m4/ltdl.m4
index 46535e2e1..f6be54a94 100644
--- a/m4/ltdl.m4
+++ b/m4/ltdl.m4
@@ -487,7 +487,7 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
# 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*)
diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c
index bdb8458e7..e707fb897 100644
--- a/src/datastore/gnunet-service-datastore.c
+++ b/src/datastore/gnunet-service-datastore.c
@@ -336,7 +336,7 @@ transmit_item (void *cls,
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 @@ remove_callback (void *cls,
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)
diff --git a/src/util/client.c b/src/util/client.c
index 7923f5697..f0322ffa5 100644
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -103,7 +103,7 @@ struct GNUNET_CLIENT_Connection
/**
* Size of received_buf.
*/
- size_t received_size;
+ unsigned int received_size;
/**
* Do we have a complete response in received_buf?