As suggested by Anders: back out 37112.

[obnox/wireshark/wip.git] / epan / epan.c

diff --git a/epan/epan.c b/epan/epan.c
index 7937a5759636fea7699f3967f91603b6138357da..236ea20b925356e9e376de3440409e120a2a0277 100644 (file)
--- a/epan/epan.c
+++ b/epan/epan.c
@@ -235,10 +235,11 @@ epan_dissect_prime_dfilter(epan_dissect_t *edt, const dfilter_t* dfcode)
 /* ----------------------- */
 const gchar *
 epan_custom_set(epan_dissect_t *edt, int field_id,
+                             gint occurrence,
                              gchar *result,
                              gchar *expr, const int size )
 {
-    return proto_custom_set(edt->tree, field_id, result, expr, size);
+    return proto_custom_set(edt->tree, field_id, occurrence, result, expr, size);
 }
 
 void
@@ -358,7 +359,11 @@ epan_get_compiled_version_info(GString *str)
  * Get runtime information for libraries used by libwireshark.
  */
 void
-epan_get_runtime_version_info(GString *str)
+epan_get_runtime_version_info(GString *str
+#if !defined(HAVE_LIBGNUTLS) && !defined(HAVE_LIBGCRYPT)
+_U_
+#endif
+)
 {
         /* GnuTLS */
 #ifdef HAVE_LIBGNUTLS