Standardize includes for other POSIX platforms.

MasterPassword/C/build

@@ -280,6 +280,7 @@ mpw-tests() {
         # include paths
         -I"lib/include"
         -I"/usr/include/libxml2"
+        -I"/usr/local/include/libxml2"
     )
     LDFLAGS=(
         # scrypt

MasterPassword/C/mpw-algorithm.h

@@ -6,7 +6,7 @@
 //  Copyright (c) 2014 Lyndir. All rights reserved.
 //
 
-#import "mpw-types.h"
+#include "mpw-types.h"
 
 typedef enum(unsigned int, MPAlgorithmVersion) {
     /** V0 did math with chars whose signedness was platform-dependent. */

MasterPassword/C/mpw-algorithm_v0.c

@@ -9,8 +9,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
-#include "mpw-types.h"
 #include "mpw-util.h"
 
 #define MP_N                32768

MasterPassword/C/mpw-algorithm_v1.c

@@ -9,8 +9,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
-#include "mpw-types.h"
 #include "mpw-util.h"
 
 #define MP_N                32768

MasterPassword/C/mpw-algorithm_v2.c

@@ -9,8 +9,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
-#include "mpw-types.h"
 #include "mpw-util.h"
 
 #define MP_N                32768

MasterPassword/C/mpw-algorithm_v3.c

@@ -9,8 +9,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
-#include "mpw-types.h"
 #include "mpw-util.h"
 
 #define MP_N                32768

MasterPassword/C/mpw-bench.c

@@ -15,7 +15,6 @@
 #include <scrypt/sha256.h>
 #include <bcrypt/ow-crypt.h>
 
-#include "mpw-types.h"
 #include "mpw-algorithm.h"
 #include "mpw-util.h"
 

MasterPassword/C/mpw-cli.c

@@ -15,7 +15,6 @@
 
 #define ftl(...) do { fprintf( stderr, __VA_ARGS__ ); exit(2); } while (0)
 
-#include "mpw-types.h"
 #include "mpw-algorithm.h"
 #include "mpw-util.h"
 

MasterPassword/C/mpw-tests.c

@@ -5,7 +5,6 @@
 
 #define ftl(...) do { fprintf( stderr, __VA_ARGS__ ); exit(2); } while (0)
 
-#include "mpw-types.h"
 #include "mpw-algorithm.h"
 #include "mpw-util.h"
 

MasterPassword/C/mpw-types.h

@@ -7,6 +7,7 @@
 //
 
 #include <stdlib.h>
+#include <stdint.h>
 
 #ifdef NS_ENUM
 #define enum(_type, _name) NS_ENUM(_type, _name)

MasterPassword/C/mpw-util.h

@@ -6,6 +6,8 @@
 //  Copyright (c) 2014 Lyndir. All rights reserved.
 //
 
+#include <stdint.h>
+
 //// Logging.
 
 #ifdef DEBUG