[esnacc-dev] [RFC PATCH 3/5] c-lib: Rename all of the include directories
Aaron Conole
aconole at bytheb.org
Tue Jan 3 22:25:14 UTC 2017
The c-library includes all point to the c-lib/inc/ directory, now. This
will facilitate moving away from having custom pkgconfig CFLAGS for the
include directories.
Signed-off-by: Aaron Conole <aconole at bytheb.org>
---
c-lib/inc/asn-any.h | 2 +-
c-lib/inc/asn-config.h | 10 ++++----
c-lib/inc/asn-der.h | 4 +--
c-lib/inc/asn-incl.h | 59 +++++++++++++++++++-------------------------
c-lib/inc/asn-oid.h | 2 +-
c-lib/inc/asn-relative-oid.h | 2 +-
c-lib/inc/gen-buf.h | 3 +--
c-lib/inc/mem.h | 4 +--
c-lib/inc/tbl-dbg.h | 2 +-
c-lib/inc/tbl-gen.h | 2 +-
c-lib/inc/tbl-incl.h | 14 +++++------
11 files changed, 48 insertions(+), 56 deletions(-)
diff --git a/c-lib/inc/asn-any.h b/c-lib/inc/asn-any.h
index 8f7b544..a4d8b8f 100644
--- a/c-lib/inc/asn-any.h
+++ b/c-lib/inc/asn-any.h
@@ -20,7 +20,7 @@
#ifndef _asn_any_h_
#define _asn_any_h_
-#include "hash.h"
+#include "c-lib/inc/hash.h"
#ifdef __cplusplus
extern "C" {
diff --git a/c-lib/inc/asn-config.h b/c-lib/inc/asn-config.h
index 9a31d6e..1c30f2c 100644
--- a/c-lib/inc/asn-config.h
+++ b/c-lib/inc/asn-config.h
@@ -102,7 +102,7 @@
/* for pow() used in asn_real.c - must include to avoid casting err on pow */
/* #include <math.h> */
-#include "snacc.h"
+#include "c-lib/inc/snacc.h"
/* used to test if optionals are present */
@@ -151,7 +151,7 @@ Asn1ErrorHandler Asn1InstallErrorHandler PROTO ((Asn1ErrorHandler handler));
#endif /* __cplusplus */
#ifdef USE_NIBBLE_MEMORY
-#include "nibble-alloc.h"
+#include "c-lib/inc/nibble-alloc.h"
#define Asn1Alloc( size) NibbleAlloc (size)
#define Asn1Free( ptr) /* empty */
@@ -161,7 +161,7 @@ Asn1ErrorHandler Asn1InstallErrorHandler PROTO ((Asn1ErrorHandler handler));
#else /* !USE_NIBBLE_MEMORY */
-#include "mem.h"
+#include "c-lib/inc/mem.h"
#define Asn1Alloc( size) Malloc (size)
#define Asn1Free( ptr) Free (ptr)
@@ -184,7 +184,7 @@ Asn1ErrorHandler Asn1InstallErrorHandler PROTO ((Asn1ErrorHandler handler));
* the GenBufs aren't such a big performance hit for table stuff.
*
*/
-#include "gen-buf.h"
+#include "c-lib/inc/gen-buf.h"
//#define BUF_TYPE GenBuf *
#define BufGetByte( b) GenBufGetByte (b)
@@ -205,7 +205,7 @@ Asn1ErrorHandler Asn1InstallErrorHandler PROTO ((Asn1ErrorHandler handler));
-#include "print.h" /* for printing set up */
+#include "c-lib/inc/print.h" /* for printing set up */
#ifdef WIN32
#pragma warning( disable : 4127 ) /* IGNORE constant conditional expression. */
diff --git a/c-lib/inc/asn-der.h b/c-lib/inc/asn-der.h
index 314e658..5623f1b 100644
--- a/c-lib/inc/asn-der.h
+++ b/c-lib/inc/asn-der.h
@@ -44,8 +44,8 @@
*/
#ifndef _asn_der_h
#define _asn_der_h
-#include "exp-buf.h"
-#include "gen-buf.h"
+#include "c-lib/inc/exp-buf.h"
+#include "c-lib/inc/gen-buf.h"
#ifdef __cplusplus
extern "C" {
diff --git a/c-lib/inc/asn-incl.h b/c-lib/inc/asn-incl.h
index 7cd2af8..dd4782d 100644
--- a/c-lib/inc/asn-incl.h
+++ b/c-lib/inc/asn-incl.h
@@ -83,37 +83,30 @@
*
*/
-#include "asn-config.h"
-#include "gen-buf.h"
-/*
-#include "exp-buf.h"
-#include "sbuf.h"
-*/
-#include "asn-len.h"
-#include "asn-tag.h"
-#include "asn-bool.h"
-#include "asn-int.h"
-#include "asn-enum.h"
-#include "asn-real.h"
-#include "asn-octs.h"
-#include "asn-bits.h"
-#include "asn-oid.h"
-#include "asn-relative-oid.h"
-#include "asn-null.h"
-#include "asn-any.h"
-#include "asn-list.h"
-#include "asn-der.h"
-#include "asn-PrintableStr.h"
-#include "asn-UniversalString.h"
-#include "asn-BMPString.h"
-#include "asn-UTF8String.h"
-#include "asn-VisibleString.h"
-#include "asn-IA5String.h"
-#include "asn-NumericString.h"
-#include "asn-TeletexString.h"
-#include "snaccCder.h"
-#include "print.h"
+#include "c-lib/inc/asn-config.h"
+#include "c-lib/inc/gen-buf.h"
+#include "c-lib/inc/asn-len.h"
+#include "c-lib/inc/asn-tag.h"
+#include "c-lib/inc/asn-bool.h"
+#include "c-lib/inc/asn-int.h"
+#include "c-lib/inc/asn-enum.h"
+#include "c-lib/inc/asn-real.h"
+#include "c-lib/inc/asn-octs.h"
+#include "c-lib/inc/asn-bits.h"
+#include "c-lib/inc/asn-oid.h"
+#include "c-lib/inc/asn-relative-oid.h"
+#include "c-lib/inc/asn-null.h"
+#include "c-lib/inc/asn-any.h"
+#include "c-lib/inc/asn-list.h"
+#include "c-lib/inc/asn-der.h"
+#include "c-lib/inc/asn-PrintableStr.h"
+#include "c-lib/inc/asn-UniversalString.h"
+#include "c-lib/inc/asn-BMPString.h"
+#include "c-lib/inc/asn-UTF8String.h"
+#include "c-lib/inc/asn-VisibleString.h"
+#include "c-lib/inc/asn-IA5String.h"
+#include "c-lib/inc/asn-NumericString.h"
+#include "c-lib/inc/asn-TeletexString.h"
+#include "c-lib/inc/snaccCder.h"
+#include "c-lib/inc/print.h"
#define MAX_BUF 4096
-
-
-
diff --git a/c-lib/inc/asn-oid.h b/c-lib/inc/asn-oid.h
index 0ee1078..5f495ca 100644
--- a/c-lib/inc/asn-oid.h
+++ b/c-lib/inc/asn-oid.h
@@ -22,7 +22,7 @@
#ifndef _asn_oid_h_
#define _asn_oid_h_
-#include "asn-octs.h"
+#include "c-lib/inc/asn-octs.h"
#ifdef __cplusplus
extern "C" {
diff --git a/c-lib/inc/asn-relative-oid.h b/c-lib/inc/asn-relative-oid.h
index a8be659..41de534 100644
--- a/c-lib/inc/asn-relative-oid.h
+++ b/c-lib/inc/asn-relative-oid.h
@@ -22,7 +22,7 @@
#ifndef _asn_relative_oid_h_
#define _asn_relative_oid_h_
-#include "asn-octs.h"
+#include "c-lib/inc/asn-octs.h"
#ifdef __cplusplus
extern "C" {
diff --git a/c-lib/inc/gen-buf.h b/c-lib/inc/gen-buf.h
index 699a033..d52868c 100644
--- a/c-lib/inc/gen-buf.h
+++ b/c-lib/inc/gen-buf.h
@@ -26,8 +26,7 @@
#ifndef _gen_buf_h_
#define _gen_buf_h_
-#include "config.h"
-#include "snacc.h"
+#include "c-lib/inc/snacc.h"
#ifdef __cplusplus
extern "C" {
diff --git a/c-lib/inc/mem.h b/c-lib/inc/mem.h
index 3b2fc6b..efbc41f 100644
--- a/c-lib/inc/mem.h
+++ b/c-lib/inc/mem.h
@@ -47,8 +47,8 @@
extern "C" {
#endif
-#include "snacc.h"
-#include "asn-incl.h"
+#include "c-lib/inc/snacc.h"
+#include "c-lib/inc/asn-incl.h"
void *Malloc PROTO ((int size));
void *Realloc PROTO ((void *ptr, int newsize));
diff --git a/c-lib/inc/tbl-dbg.h b/c-lib/inc/tbl-dbg.h
index c31c4df..14756ed 100644
--- a/c-lib/inc/tbl-dbg.h
+++ b/c-lib/inc/tbl-dbg.h
@@ -1,7 +1,7 @@
#ifndef TBL_DBG_H
#define TBL_DBG_H
-#include "tbl-gen.h"
+#include "c-lib/inc/tbl-gen.h"
extern TdeExceptionCode DBGMinCode; /* Defaults to TDEINFO */
int DBGSimple PROTO ((AsnTag tag, AsnOcts* v, int begin));
diff --git a/c-lib/inc/tbl-gen.h b/c-lib/inc/tbl-gen.h
index 019920e..57917ec 100644
--- a/c-lib/inc/tbl-gen.h
+++ b/c-lib/inc/tbl-gen.h
@@ -2,7 +2,7 @@
#define TBL_GEN_H
#define USE_GEN_BUF 1
-#include "tbl-incl.h"
+#include "c-lib/inc/tbl-incl.h"
typedef enum {TDEINFO, TDEEOC=TDEINFO, TDEPEEKTAG, TDEPUSHTAG,
TDEWARNING, TDEUNEXPECTED=TDEWARNING, TDENONOPTIONAL, TDEMANDATORY,
diff --git a/c-lib/inc/tbl-incl.h b/c-lib/inc/tbl-incl.h
index 8eb4d57..fdd8c1b 100644
--- a/c-lib/inc/tbl-incl.h
+++ b/c-lib/inc/tbl-incl.h
@@ -38,8 +38,8 @@
#define TTBL 3
-#include "asn-incl.h"
-#include "tbl.h"
+#include "c-lib/inc/asn-incl.h"
+#include "c-lib/inc/tbl.h"
typedef void AVal;
@@ -52,11 +52,11 @@ typedef struct AChoiceVal
} AChoiceVal;
-#include "tbl-util.h"
-#include "tbl-enc.h"
-#include "tbl-dec.h"
-#include "tbl-print.h"
-#include "tbl-free.h"
+#include "c-lib/inc/tbl-util.h"
+#include "c-lib/inc/tbl-enc.h"
+#include "c-lib/inc/tbl-dec.h"
+#include "c-lib/inc/tbl-print.h"
+#include "c-lib/inc/tbl-free.h"
/*
* TblError (char *str) - configure error handler
--
2.7.4
More information about the dev
mailing list