From: Hannes Magnusson <bjori@php.net>
Date: Mon, 12 Sep 2011 10:24:27 +0000 (+0000)
Subject: Sync line ending with 5_4
X-Git-Tag: php-5.5.0alpha1~1182
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0dbb43935b4515043736eaaa0c05014cf0daac6;p=php

Sync line ending with 5_4
---

diff --git a/ext/standard/crypt_blowfish.h b/ext/standard/crypt_blowfish.h
index 34316854c8..da374730e9 100644
--- a/ext/standard/crypt_blowfish.h
+++ b/ext/standard/crypt_blowfish.h
@@ -1,32 +1,32 @@
-/* $Id$ */
-/*
- * Written by Solar Designer <solar at openwall.com> in 2000-2011.
- * No copyright is claimed, and the software is hereby placed in the public
- * domain. In case this attempt to disclaim copyright and place the software
- * in the public domain is deemed null and void, then the software is
- * Copyright (c) 2000-2011 Solar Designer and it is hereby released to the
- * general public under the following terms:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted.
- *
- * There's ABSOLUTELY NO WARRANTY, express or implied.
- *
- * See crypt_blowfish.c for more information.
- */
-
-#ifndef _CRYPT_BLOWFISH_H
-#define _CRYPT_BLOWFISH_H
-
-#if 0
-extern int _crypt_output_magic(const char *setting, char *output, int size);
-#endif
-extern char *php_crypt_blowfish_rn(const char *key, const char *setting,
-	char *output, int size);
-#if 0
-extern char *_crypt_gensalt_blowfish_rn(const char *prefix,
-	unsigned long count,
-	const char *input, int size, char *output, int output_size);
-#endif
-
-#endif
+/* $Id$ */
+/*
+ * Written by Solar Designer <solar at openwall.com> in 2000-2011.
+ * No copyright is claimed, and the software is hereby placed in the public
+ * domain. In case this attempt to disclaim copyright and place the software
+ * in the public domain is deemed null and void, then the software is
+ * Copyright (c) 2000-2011 Solar Designer and it is hereby released to the
+ * general public under the following terms:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted.
+ *
+ * There's ABSOLUTELY NO WARRANTY, express or implied.
+ *
+ * See crypt_blowfish.c for more information.
+ */
+
+#ifndef _CRYPT_BLOWFISH_H
+#define _CRYPT_BLOWFISH_H
+
+#if 0
+extern int _crypt_output_magic(const char *setting, char *output, int size);
+#endif
+extern char *php_crypt_blowfish_rn(const char *key, const char *setting,
+	char *output, int size);
+#if 0
+extern char *_crypt_gensalt_blowfish_rn(const char *prefix,
+	unsigned long count,
+	const char *input, int size, char *output, int output_size);
+#endif
+
+#endif