aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2015-01-18 10:23:10 +0100
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2015-01-18 09:24:19 +0000
commitc60fb3038e4a449c5488a32574d838a6599cb33f (patch)
tree0c7f7f24402634de66e7e99a3dcd6720031e1886 /epan
parenta1f2342e13c576ae4899bd11e54d350b1ea23625 (diff)
Try to make Mac OS X Buildbots happy
fix return makes pointer from integer without a cast Change-Id: Iaa55de58c36b1a59b08946836e519fee7bb889fc Reviewed-on: https://code.wireshark.org/review/6607 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan')
-rw-r--r--epan/geoip_db.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/geoip_db.c b/epan/geoip_db.c
index f94ba7c8c7..7ef82645ce 100644
--- a/epan/geoip_db.c
+++ b/epan/geoip_db.c
@@ -580,7 +580,7 @@ geoip_db_lookup_ipv4(guint dbnum _U_, guint32 addr _U_, const char *not_found) {
if (not_found == NULL)
return NULL;
- return wmem_strdup(NULL, not_found);
+ return (char *)wmem_strdup(NULL, not_found);
}
char *
@@ -588,7 +588,7 @@ geoip_db_lookup_ipv6(guint dbnum _U_, guint32 addr _U_, const char *not_found) {
if (not_found == NULL)
return NULL;
- return wmem_strdup(NULL, not_found);
+ return (char *)wmem_strdup(NULL, not_found);
}
gchar *