Merge pull request #254 from crondaemon/osx

compile better on OSX

.travis.yml

@@ -9,7 +9,7 @@ compiler:
   - gcc
 matrix:
 before_install:
-  - $CC --version
+  - if [ "$TRAVIS_OS_NAME" == "osx" ];then brew install libgcrypt; fi
 before_script:
   ./configure
 script:

hydra-mod.h

@@ -3,6 +3,14 @@
 
 #include "hydra.h"
 
+#ifdef __sun
+  #include <sys/int_types.h>
+#elif defined(__FreeBSD__) || defined(__IBMCPP__) || defined(_AIX)
+  #include <inttypes.h>
+#else
+  #include <stdint.h>
+#endif
+
 extern char quiet;
 
 extern void hydra_child_exit(int32_t code);

hydra-rdp.c

@@ -34,6 +34,8 @@ It's particularly true on windows XP
 
 */
 
+#include <hydra-mod.h>
+
 #ifndef LIBOPENSSL
 #include <stdio.h>
 void dummy_rdp() {

hydra-sip.c

@@ -5,6 +5,9 @@
  *
  * 05042011 david: modified to use sasl lib
  */
+
+#include "hydra-mod.h"
+
 #ifndef LIBOPENSSL
 #include <stdio.h>
 void dummy_sip() {
@@ -12,15 +15,7 @@ void dummy_sip() {
 }
 #else
 
-#ifdef __sun
-  #include <sys/int_types.h>
-#elif defined(__FreeBSD__) || defined(__IBMCPP__) || defined(_AIX)
-  #include <inttypes.h>
-#else
-  #include <stdint.h>
-#endif
 #include "sasl.h"
-#include "hydra-mod.h"
 
 extern int32_t hydra_data_ready_timed(int32_t socket, long sec, long usec);