Merge commit '1678ee'

[paraslash.git] / crypt_common.c

diff --git a/crypt_common.c b/crypt_common.c
index 8fac0dc71ed37a7dff633a2891d4ada1a0c0376b..e02dc6af5b88ac5d5deb83f10d333324448c112a 100644 (file)
--- a/crypt_common.c
+++ b/crypt_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,7 +7,6 @@
 /** \file crypt_common.c Crypto functions independent of openssl/libgcrypt. */
 
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "error.h"
@@ -86,7 +85,7 @@ int base64_decode(char const *src, unsigned char *target, size_t targsize)
                        break;
 
                pos = strchr(Base64, ch);
-               if (pos == 0) /* A non-base64 character. */
+               if (pos == NULL) /* A non-base64 character. */
                        return -E_BASE64;
 
                switch (state) {