Merge pull request #593 from SaberUK/master+configure-shuffle

Remove a ton of duplicate and obsolete code from configure.

3 files changed, 2 insertions, 24 deletions

diff --git a/src/modules/m_md5.cpp b/src/modules/m_md5.cpp
index 15cb979c6..dd72fe9ea 100644
--- a/src/modules/m_md5.cpp
+++ b/src/modules/m_md5.cpp
@@ -22,9 +22,6 @@
 
 
 #include "inspircd.h"
-#ifdef HAS_STDINT
-#include <stdint.h>
-#endif
 #include "modules/hash.h"
 
 /* The four core functions - F1 is optimized somewhat */
@@ -37,10 +34,6 @@
 #define MD5STEP(f,w,x,y,z,in,s) \
 	(w += f(x,y,z) + in, w = (w<<s | w>>(32-s)) + x)
 
-#ifndef HAS_STDINT
-typedef unsigned int uint32_t;
-#endif
-
 typedef uint32_t word32; /* NOT unsigned long. We don't support 16 bit platforms, anyway. */
 typedef unsigned char byte;
 
diff --git a/src/modules/m_ripemd160.cpp b/src/modules/m_ripemd160.cpp
index 0e17c5137..ae8d15a30 100644
--- a/src/modules/m_ripemd160.cpp
+++ b/src/modules/m_ripemd160.cpp
@@ -59,20 +59,12 @@
 /* macro definitions */
 
 #include "inspircd.h"
-#ifdef HAS_STDINT
-#include <stdint.h>
-#endif
 #include "modules/hash.h"
 
 #define RMDsize 160
 
-#ifndef HAS_STDINT
-typedef		unsigned char		byte;
-typedef		unsigned int		dword;
-#else
-typedef		uint8_t			byte;
-typedef		uint32_t		dword;
-#endif
+typedef uint8_t byte;
+typedef uint32_t dword;
 
 /* collect four bytes into one word: */
 #define BYTES_TO_DWORD(strptr)                    \
diff --git a/src/modules/m_sha256.cpp b/src/modules/m_sha256.cpp
index 835d12ae4..82ac8c160 100644
--- a/src/modules/m_sha256.cpp
+++ b/src/modules/m_sha256.cpp
@@ -57,15 +57,8 @@
  */
 
 #include "inspircd.h"
-#ifdef HAS_STDINT
-#include <stdint.h>
-#endif
 #include "modules/hash.h"
 
-#ifndef HAS_STDINT
-typedef unsigned int uint32_t;
-#endif
-
 #define SHA256_DIGEST_SIZE (256 / 8)
 #define SHA256_BLOCK_SIZE  (512 / 8)