From 6aa50bac04343d4d5bcd3bed767da521f459e325 Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Wed, 15 Oct 2014 15:32:10 -0400
Subject: [PATCH] Ensure we use the correct C language standard.

---
 MasterPassword/C/build | 18 ++++++++++--------
 MasterPassword/C/mpw.c |  4 +++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/MasterPassword/C/build b/MasterPassword/C/build
index 11b91f76..4d9b29dc 100755
--- a/MasterPassword/C/build
+++ b/MasterPassword/C/build
@@ -31,12 +31,12 @@ if ! [[ -e lib/scrypt/scrypt-scryptenc.o ]]; then
         if [[ ! -e configure.ac ]]; then
             # libscrypt needs sources.
             source .source
-            if hash git-svn; then
+            if hash git-svn 2>/dev/null; then
                 echo
                 echo "Fetching libscrypt using git-svn..."
                 git-svn clone --prefix=origin/ --stdlayout "$svn" .
                 printf '%s' "$(git describe --always)" > scrypt-version
-            elif hash svn; then
+            elif hash svn 2>/dev/null; then
                 echo
                 echo "Fetching libscrypt using svn..."
                 svn checkout http://scrypt.googlecode.com/svn/trunk/ .
@@ -73,19 +73,21 @@ echo
 echo "Building mpw..."
 
 cc() {
-    if hash llvm-gcc; then
-        llvm-gcc -Qunused-arguments "$@"
+    if hash llvm-gcc 2>/dev/null; then
+        llvm-gcc -std=c11 "$@"
     else
-        gcc "$@"
+        gcc -std=gnu99 "$@"
     fi
 }
 
 
 ### MPW
 
-options+=(
+CFLAGS=(
     # include paths.
     -I"lib/scrypt/lib" -I"lib/scrypt/libcperciva"
+)
+LDFLAGS=(
     # library paths.
     -L"." -L"lib/scrypt"
     # link libraries.
@@ -98,6 +100,6 @@ options+=(
     -l"crypto"
 )
 
-cc "${options[@]}" -std=c99 -c types.c -o types.o "$@"
-cc "${options[@]}" -std=c99 -l"types.o" mpw.c -o mpw "$@"
+cc "${CFLAGS[@]}"                 "${options[@]}" -c types.c -o types.o "$@"
+cc "${CFLAGS[@]}" "${LDFLAGS[@]}" "${options[@]}" "types.o" mpw.c -o mpw "$@"
 echo "done!  Now run ./install or use ./mpw"
diff --git a/MasterPassword/C/mpw.c b/MasterPassword/C/mpw.c
index 483f7fb5..51e5a312 100644
--- a/MasterPassword/C/mpw.c
+++ b/MasterPassword/C/mpw.c
@@ -1,4 +1,6 @@
-#define _WITH_GETLINE
+#define _ISOC11_SOURCE 1
+#define __STDC_VERSION__ 201112L
+
 #include <stdio.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>