Commit 82271cee authored by Richard Levitte's avatar Richard Levitte
Browse files

In Message-ID: <003201bfb332$14a07520$0801a8c0@janm.transactionsite.com>, 

"Jan Mikkelsen" <janm@transactionsite.com> correctly states that the
OpenSSL header files have #include's and extern "C"'s in an incorrect
order.  Thusly fixed.
parent 22a41547

crypto/asn1/asn1.h

+4 −4
Original line number Diff line number Diff line
@@ -59,10 +59,6 @@ 
#ifndef HEADER_ASN1_H

#define HEADER_ASN1_H



#ifdef  __cplusplus

extern "C" {

#endif



#include <time.h>

#include <openssl/bn.h>

#include <openssl/stack.h>
@@ -72,6 +68,10 @@ extern "C" { 
#include <openssl/vms_idhacks.h>

#endif



#ifdef  __cplusplus

extern "C" {

#endif



#define V_ASN1_UNIVERSAL		0x00

#define	V_ASN1_APPLICATION		0x40

#define V_ASN1_CONTEXT_SPECIFIC		0x80

crypto/asn1/asn1_mac.h

+2 −2
Original line number Diff line number Diff line
@@ -59,12 +59,12 @@ 
#ifndef HEADER_ASN1_MAC_H

#define HEADER_ASN1_MAC_H



#include <openssl/asn1.h>



#ifdef  __cplusplus

extern "C" {

#endif



#include <openssl/asn1.h>



#ifndef ASN1_MAC_ERR_LIB

#define ASN1_MAC_ERR_LIB	ERR_LIB_ASN1

#endif

crypto/bio/bio.h

+4 −4
Original line number Diff line number Diff line
@@ -59,14 +59,14 @@ 
#ifndef HEADER_BIO_H

#define HEADER_BIO_H



#ifdef  __cplusplus

extern "C" {

#endif



#include <stdio.h>

#include <stdlib.h>

#include <openssl/crypto.h>



#ifdef  __cplusplus

extern "C" {

#endif



/* These are the 'types' of BIOs */

#define BIO_TYPE_NONE		0

#define BIO_TYPE_MEM		(1|0x0400)

crypto/comp/comp.h

+2 −2
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ 
#ifndef HEADER_COMP_H

#define HEADER_COMP_H



#include <openssl/crypto.h>



#ifdef  __cplusplus

extern "C" {

#endif



#include <openssl/crypto.h>



typedef struct comp_method_st

	{

	int type;		/* NID for compression library */

crypto/conf/conf.h

+4 −4
Original line number Diff line number Diff line
@@ -59,16 +59,16 @@ 
#ifndef  HEADER_CONF_H

#define HEADER_CONF_H



#ifdef  __cplusplus

extern "C" {

#endif



#include <openssl/bio.h>

#include <openssl/lhash.h>

#include <openssl/stack.h>

#include <openssl/safestack.h>

#include <openssl/e_os.h>



#ifdef  __cplusplus

extern "C" {

#endif



typedef struct

	{

	char *section;