enum: Don't directly include enum.h
To allow enum.h to depend on utils.h definitions, avoid its direct inclusion. Instead include utils.h, which includes enum.h as well.
This commit is contained in:
parent
8584e62368
commit
9ee8b3b41f
|
@ -24,7 +24,7 @@
|
|||
|
||||
typedef enum configuration_attribute_type_t configuration_attribute_type_t;
|
||||
|
||||
#include <utils/enum.h>
|
||||
#include <utils/utils.h>
|
||||
|
||||
/**
|
||||
* Type of the attribute, as in IKEv2 RFC 3.15.1 or IKEv1 ModeConfig.
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#ifndef SIMAKA_MESSAGE_H_
|
||||
#define SIMAKA_MESSAGE_H_
|
||||
|
||||
#include <utils/enum.h>
|
||||
#include <utils/utils.h>
|
||||
#include <eap/eap.h>
|
||||
|
||||
#include "simaka_crypto.h"
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
typedef enum transform_type_t transform_type_t;
|
||||
|
||||
#include <utils/enum.h>
|
||||
#include <utils/utils.h>
|
||||
|
||||
/**
|
||||
* Type of a transform, as in IKEv2 RFC 3.3.2.
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include "pgp_builder.h"
|
||||
#include "pgp_utils.h"
|
||||
|
||||
#include <utils/enum.h>
|
||||
#include <utils/utils.h>
|
||||
#include <utils/debug.h>
|
||||
#include <credentials/keys/private_key.h>
|
||||
|
||||
|
@ -273,4 +273,3 @@ private_key_t *pgp_private_key_load(key_type_t type, va_list args)
|
|||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@ typedef struct pkcs11_library_t pkcs11_library_t;
|
|||
|
||||
#include "pkcs11.h"
|
||||
|
||||
#include <utils/enum.h>
|
||||
#include <utils/utils.h>
|
||||
#include <utils/chunk.h>
|
||||
#include <collections/enumerator.h>
|
||||
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
|
||||
#include "test_suite.h"
|
||||
|
||||
#include <utils/enum.h>
|
||||
#include <utils/utils.h>
|
||||
|
||||
/*******************************************************************************
|
||||
|
|
|
@ -26,7 +26,7 @@ typedef enum level_t level_t;
|
|||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "utils/enum.h"
|
||||
#include <utils/utils.h>
|
||||
|
||||
/**
|
||||
* Debug message group.
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
#include <stdio.h>
|
||||
|
||||
#include <library.h>
|
||||
#include <utils/utils.h>
|
||||
|
||||
#include "enum.h"
|
||||
|
||||
|
|
|
@ -29,9 +29,6 @@
|
|||
#include <arpa/inet.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "enum.h"
|
||||
#include "utils/strerror.h"
|
||||
|
||||
/**
|
||||
* strongSwan program return codes
|
||||
*/
|
||||
|
@ -73,6 +70,9 @@
|
|||
# define TRUE true
|
||||
#endif /* TRUE */
|
||||
|
||||
#include "enum.h"
|
||||
#include "utils/strerror.h"
|
||||
|
||||
/**
|
||||
* Helper function that compares two strings for equality
|
||||
*/
|
||||
|
|
Loading…
Reference in New Issue