diff options
author | Olivier Biot <obiot.ethereal@gmail.com> | 2004-05-10 22:20:24 +0000 |
---|---|---|
committer | Olivier Biot <obiot.ethereal@gmail.com> | 2004-05-10 22:20:24 +0000 |
commit | 4ee7c7faf6eaf275e6b4789acbc3c6c2585f26d5 (patch) | |
tree | b12ff9e329557a4fd86946f39cdc931312d3bb5a /util.h | |
parent | 687f3af0f21a62d4b687549c5f6546bac6b02747 (diff) |
As noted by Thomas Anders, the Heimdal libroken library has a base64_decode()
function with a different signature than the one defined in util.c/util.h.
For this reason, we need to rename our base64_decode() routine.
The routine is now called epan_base64_decode().
svn path=/trunk/; revision=10840
Diffstat (limited to 'util.h')
-rw-r--r-- | util.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,7 +1,7 @@ /* util.h * Utility definitions * - * $Id: util.h,v 1.31 2004/01/11 22:17:43 guy Exp $ + * $Id: util.h,v 1.32 2004/05/10 22:20:24 obiot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -45,7 +45,7 @@ guint8 EBCDIC_to_ASCII1(guint8 c); /* Compute the difference between two seconds/microseconds time stamps. */ void compute_timestamp_diff(gint *, gint *, guint32, guint32, guint32, guint32); /* In-place decoding of a base64 string. */ -size_t base64_decode(char *s); +size_t epan_base64_decode(char *s); /* Create a capture filter for the connection */ char *get_conn_cfilter(void); |