aboutsummaryrefslogtreecommitdiff
path: root/crypt
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-01-30 21:20:32 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-01-30 21:20:32 +0000
commitc8a89e7dd5cab24242cc9050387bd5bb902da11a (patch)
tree7aeca9797fb026f8df75c8285e3a1bfed6180da7 /crypt
parent3b1004624e54cc2fefd034ff80d5dea4b6db764f (diff)
downloadglibc-c8a89e7dd5cab24242cc9050387bd5bb902da11a.zip
glibc-c8a89e7dd5cab24242cc9050387bd5bb902da11a.tar.gz
glibc-c8a89e7dd5cab24242cc9050387bd5bb902da11a.tar.bz2
Remove miscellaneous __STDC__ conditionals.
Diffstat (limited to 'crypt')
-rw-r--r--crypt/cert.c4
-rw-r--r--crypt/crypt-entry.c4
-rw-r--r--crypt/crypt_util.c2
3 files changed, 1 insertions, 9 deletions
diff --git a/crypt/cert.c b/crypt/cert.c
index 34d7e41..8c838e9 100644
--- a/crypt/cert.c
+++ b/crypt/cert.c
@@ -12,14 +12,10 @@
int totfails = 0;
-#if __STDC__ - 0
int main (int argc, char *argv[]);
void get8 (char *cp);
void put8 (char *cp);
void good_bye (void) __attribute__ ((noreturn));
-#else
-void get8(), put8();
-#endif
void good_bye ()
{
diff --git a/crypt/crypt-entry.c b/crypt/crypt-entry.c
index fdddad2..97bd145 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
diff --git a/crypt/crypt_util.c b/crypt/crypt_util.c
index 62c8790..7fcbd8f 100644
--- a/crypt/crypt_util.c
+++ b/crypt/crypt_util.c
@@ -49,7 +49,6 @@
#include "crypt-private.h"
/* Prototypes for local functions. */
-#if __STDC__ - 0
#ifndef __GNU_LIBRARY__
void _ufc_clearmem (char *start, int cnt);
void _ufc_copymem (char *from, char *to, int cnt);
@@ -59,7 +58,6 @@ STATIC void shuffle_sb (long32 *k, ufc_long saltbits);
#else
STATIC void shuffle_sb (long64 *k, ufc_long saltbits);
#endif
-#endif
/*