diff options
author | Ulrich Drepper <drepper@gmail.com> | 2012-01-30 22:34:33 -0500 |
---|---|---|
committer | Ulrich Drepper <drepper@gmail.com> | 2012-01-30 22:34:33 -0500 |
commit | 0eb6f47528cc10645cb0a6919b3af53166ca4fe8 (patch) | |
tree | db61d4a90096b60be41fb33d6d87e79d1d9c3b04 /crypt/crypt-entry.c | |
parent | 27a25b6e633a3ea071e229337eaae36d0fa243fa (diff) | |
parent | c8a89e7dd5cab24242cc9050387bd5bb902da11a (diff) | |
download | glibc-0eb6f47528cc10645cb0a6919b3af53166ca4fe8.tar.gz glibc-0eb6f47528cc10645cb0a6919b3af53166ca4fe8.tar.xz glibc-0eb6f47528cc10645cb0a6919b3af53166ca4fe8.zip |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
Diffstat (limited to 'crypt/crypt-entry.c')
-rw-r--r-- | crypt/crypt-entry.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/crypt/crypt-entry.c b/crypt/crypt-entry.c index fdddad2c55..97bd14592e 100644 --- a/crypt/crypt-entry.c +++ b/crypt/crypt-entry.c @@ -1,7 +1,7 @@ /* * UFC-crypt: ultra fast crypt(3) implementation * - * Copyright (C) 1991,1992,1993,1996,1997,2007 Free Software Foundation, Inc. + * Copyright (C) 1991-1993,1996-1997,2007,2012 Free Software Foundation, Inc. * * The GNU C Library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -46,7 +46,6 @@ #include "crypt-private.h" /* Prototypes for local functions. */ -#if __STDC__ - 0 #ifndef __GNU_LIBRARY__ void _ufc_clearmem (char *start, int cnt); #else @@ -61,7 +60,6 @@ extern char *__sha256_crypt (const char *key, const char *salt); extern char *__sha512_crypt_r (const char *key, const char *salt, char *buffer, int buflen); extern char *__sha512_crypt (const char *key, const char *salt); -#endif /* Define our magic string to mark salt for MD5 encryption replacement. This is meant to be the same as for other MD5 based |