aboutsummaryrefslogtreecommitdiffstats
path: root/epan/crypt
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2012-09-20 01:48:30 +0000
committerJeff Morriss <jeff.morriss.ws@gmail.com>2012-09-20 01:48:30 +0000
commit3729335973b966a8b9b0f887c637d42be047a790 (patch)
tree3c6bda38058982470b2a7a3f4244007dbafe376c /epan/crypt
parent3551a86c36fa9f27dede601320a812d2ce0ae941 (diff)
We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45016
Diffstat (limited to 'epan/crypt')
-rw-r--r--epan/crypt/airpdcap.c4
-rw-r--r--epan/crypt/des.c4
-rw-r--r--epan/crypt/eax.c2
-rw-r--r--epan/crypt/eax.h2
-rw-r--r--epan/crypt/md4.c4
-rw-r--r--epan/crypt/md5.c4
-rw-r--r--epan/crypt/rc4.c4
7 files changed, 5 insertions, 19 deletions
diff --git a/epan/crypt/airpdcap.c b/epan/crypt/airpdcap.c
index 4f709aa0d5..b42f36d7a9 100644
--- a/epan/crypt/airpdcap.c
+++ b/epan/crypt/airpdcap.c
@@ -36,9 +36,7 @@
/****************************************************************************/
/* File includes */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
#include <epan/tvbuff.h>
#include <wsutil/crc32.h>
diff --git a/epan/crypt/des.c b/epan/crypt/des.c
index 9edafb9a5b..e729b1f210 100644
--- a/epan/crypt/des.c
+++ b/epan/crypt/des.c
@@ -23,9 +23,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
#include <glib.h>
#include <epan/crypt/des.h>
diff --git a/epan/crypt/eax.c b/epan/crypt/eax.c
index 3558dce79b..8ded6f2be6 100644
--- a/epan/crypt/eax.c
+++ b/epan/crypt/eax.c
@@ -22,9 +22,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <stdlib.h>
#ifdef HAVE_LIBGCRYPT
#include <string.h>
diff --git a/epan/crypt/eax.h b/epan/crypt/eax.h
index 8209d4d60b..46554f6d94 100644
--- a/epan/crypt/eax.h
+++ b/epan/crypt/eax.h
@@ -22,9 +22,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <glib.h>
typedef struct tagMAC_T
diff --git a/epan/crypt/md4.c b/epan/crypt/md4.c
index fd9d690f48..fc495dd3a4 100644
--- a/epan/crypt/md4.c
+++ b/epan/crypt/md4.c
@@ -20,9 +20,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
#include <glib.h>
#include <string.h>
diff --git a/epan/crypt/md5.c b/epan/crypt/md5.c
index d7a933bb13..916b19e316 100644
--- a/epan/crypt/md5.c
+++ b/epan/crypt/md5.c
@@ -26,9 +26,7 @@
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
#include <glib.h>
#include <string.h>
diff --git a/epan/crypt/rc4.c b/epan/crypt/rc4.c
index a53fa351f8..d99cc1a85e 100644
--- a/epan/crypt/rc4.c
+++ b/epan/crypt/rc4.c
@@ -23,9 +23,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
#include <glib.h>
#include <string.h>