crypt: don't include ufc-crypt.h multiple times
The file has no inclusion guards, and contains typedefs that cause errors when included multiple times with older (pre-C11) compilers such as gcc 4.4. Save the "#ifdef DOS" content to crypt-private.h even though it's likely not particularly useful.
This commit is contained in:
parent
8540f6d2a7
commit
4d3ae034b7
|
@ -1,3 +1,11 @@
|
||||||
|
2014-06-06 Chris Metcalf <cmetcalf@tilera.com>
|
||||||
|
|
||||||
|
* crypt/crypt-private.h [DOS]: Add some includes taken from the
|
||||||
|
other files in the crypt directory.
|
||||||
|
* crypt/crypt.c: Remove duplicate includes.
|
||||||
|
* crypt/crypt-entry.c: Likewise.
|
||||||
|
* crypt/crypt_util.c: Likewise.
|
||||||
|
|
||||||
2014-06-06 Joseph Myers <joseph@codesourcery.com>
|
2014-06-06 Joseph Myers <joseph@codesourcery.com>
|
||||||
|
|
||||||
* Makeconfig (run-program-env): New variable.
|
* Makeconfig (run-program-env): New variable.
|
||||||
|
|
|
@ -34,16 +34,6 @@
|
||||||
#define STATIC static
|
#define STATIC static
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef DOS
|
|
||||||
#include "ufc-crypt.h"
|
|
||||||
#else
|
|
||||||
/*
|
|
||||||
* Thanks to greg%wind@plains.NoDak.edu (Greg W. Wettstein)
|
|
||||||
* for DOS patches
|
|
||||||
*/
|
|
||||||
#include "ufc.h"
|
|
||||||
#endif
|
|
||||||
#include "crypt.h"
|
|
||||||
#include "crypt-private.h"
|
#include "crypt-private.h"
|
||||||
|
|
||||||
/* Prototypes for local functions. */
|
/* Prototypes for local functions. */
|
||||||
|
|
|
@ -28,7 +28,16 @@
|
||||||
#include <features.h>
|
#include <features.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
|
||||||
|
#ifndef DOS
|
||||||
#include "ufc-crypt.h"
|
#include "ufc-crypt.h"
|
||||||
|
#else
|
||||||
|
/*
|
||||||
|
* Thanks to greg%wind@plains.NoDak.edu (Greg W. Wettstein)
|
||||||
|
* for DOS patches
|
||||||
|
*/
|
||||||
|
#include "pl.h"
|
||||||
|
#include "ufc.h"
|
||||||
|
#endif
|
||||||
#include "crypt.h"
|
#include "crypt.h"
|
||||||
|
|
||||||
/* crypt.c */
|
/* crypt.c */
|
||||||
|
|
|
@ -23,8 +23,6 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ufc-crypt.h"
|
|
||||||
#include "crypt.h"
|
|
||||||
#include "crypt-private.h"
|
#include "crypt-private.h"
|
||||||
|
|
||||||
#ifdef _UFC_32_
|
#ifdef _UFC_32_
|
||||||
|
|
|
@ -33,17 +33,6 @@
|
||||||
#define STATIC static
|
#define STATIC static
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef DOS
|
|
||||||
#include "ufc-crypt.h"
|
|
||||||
#else
|
|
||||||
/*
|
|
||||||
* Thanks to greg%wind@plains.NoDak.edu (Greg W. Wettstein)
|
|
||||||
* for DOS patches
|
|
||||||
*/
|
|
||||||
#include "pl.h"
|
|
||||||
#include "ufc.h"
|
|
||||||
#endif
|
|
||||||
#include "crypt.h"
|
|
||||||
#include "crypt-private.h"
|
#include "crypt-private.h"
|
||||||
|
|
||||||
/* Prototypes for local functions. */
|
/* Prototypes for local functions. */
|
||||||
|
|
Loading…
Reference in New Issue