summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2013-07-31 15:32:42 +0000
committerEvan Huus <eapache@gmail.com>2013-07-31 15:32:42 +0000
commit0e90cd8f80cc0def5d30366830228c351f33fc93 (patch)
treeb4f820d16aaa7288364d1c68616020d5368fb870
parentfbbeebe054693eca609fa3b67fa292d45f61af5a (diff)
downloadwireshark-0e90cd8f80cc0def5d30366830228c351f33fc93.tar.gz
As noticed by Anders: move a wmem include outside of the #ifdef, we want it
regardless of whether or not we have GnuTLS. svn path=/trunk/; revision=51067
-rw-r--r--epan/dissectors/packet-ssl-utils.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h
index 2e49c0d968..60ca024fc9 100644
--- a/epan/dissectors/packet-ssl-utils.h
+++ b/epan/dissectors/packet-ssl-utils.h
@@ -30,6 +30,7 @@
#include <glib.h>
#include <epan/packet.h>
+#include <epan/wmem/wmem.h>
#ifdef HAVE_LIBGNUTLS
#include <wsutil/wsgcrypt.h>
@@ -39,8 +40,6 @@
#include <epan/conversation.h>
#include "ws_symbol_export.h"
-#include <epan/wmem/wmem.h>
-
/* #define SSL_FAST 1 */
#define SSL_DECRYPT_DEBUG