From 8523570288e43bb24ffcfd2e845086163fc1ad6b Mon Sep 17 00:00:00 2001 From: Mara Furland Date: Thu, 21 Nov 2024 11:00:30 -0500 Subject: [PATCH] rename HAVE_CONFIG_H to HAVE_ASN1C_CONFIG_H other projects like CppUTest also use HAVE_CONFIG_H so this will reduce conflicts --- examples/sample.makefile.regen | 2 +- libasn1common/asn1_common.h | 2 +- libasn1compiler/asn1c_internal.h | 2 +- libasn1fix/asn1fix_internal.h | 2 +- libasn1parser/asn1p_integer.h | 4 ++-- libasn1parser/asn1parser.h | 4 ++-- skeletons/asn_system.h | 2 +- skeletons/converter-example.c | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/sample.makefile.regen b/examples/sample.makefile.regen index 53c709bea..d02c25036 100755 --- a/examples/sample.makefile.regen +++ b/examples/sample.makefile.regen @@ -37,7 +37,7 @@ if test ! -f converter-example.mk ; then fi EXTRA_CFLAGS="-DJUNKTEST -D_DEFAULT_SOURCE" -test -f config.h && EXTRA_CFLAGS="-DHAVE_CONFIG_H ${EXTRA_CFLAGS}" +test -f config.h && EXTRA_CFLAGS="-DHAVE_ASN1C_CONFIG_H ${EXTRA_CFLAGS}" test -n "$TITLE" && EXTRA_CFLAGS="-DASN_CONVERTER_TITLE=\"$TITLE\" ${EXTRA_CFLAGS}" { diff --git a/libasn1common/asn1_common.h b/libasn1common/asn1_common.h index af1f7d8c1..3c12aa2a4 100644 --- a/libasn1common/asn1_common.h +++ b/libasn1common/asn1_common.h @@ -23,7 +23,7 @@ * SUCH DAMAGE. * */ -#ifdef HAVE_CONFIG_H +#ifdef HAVE_ASN1C_CONFIG_H #include #endif diff --git a/libasn1compiler/asn1c_internal.h b/libasn1compiler/asn1c_internal.h index 7a07e3540..891c474e7 100644 --- a/libasn1compiler/asn1c_internal.h +++ b/libasn1compiler/asn1c_internal.h @@ -1,7 +1,7 @@ #ifndef ASN1_COMPILER_INTERNAL_H #define ASN1_COMPILER_INTERNAL_H -#ifdef HAVE_CONFIG_H +#ifdef HAVE_ASN1C_CONFIG_H #include #endif diff --git a/libasn1fix/asn1fix_internal.h b/libasn1fix/asn1fix_internal.h index c429730f1..62657b356 100644 --- a/libasn1fix/asn1fix_internal.h +++ b/libasn1fix/asn1fix_internal.h @@ -1,7 +1,7 @@ #ifndef ASN1FIX_INTERNAL_H #define ASN1FIX_INTERNAL_H -#ifdef HAVE_CONFIG_H +#ifdef HAVE_ASN1C_CONFIG_H #include #endif diff --git a/libasn1parser/asn1p_integer.h b/libasn1parser/asn1p_integer.h index 4d1d144b6..2c4021d60 100644 --- a/libasn1parser/asn1p_integer.h +++ b/libasn1parser/asn1p_integer.h @@ -1,9 +1,9 @@ #ifndef ASN1P_INTEGER_H #define ASN1P_INTEGER_H -#ifdef HAVE_CONFIG_H +#ifdef HAVE_ASN1C_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ +#endif /* HAVE_ASN1C_CONFIG_H */ #include diff --git a/libasn1parser/asn1parser.h b/libasn1parser/asn1parser.h index 081981692..d49b65595 100644 --- a/libasn1parser/asn1parser.h +++ b/libasn1parser/asn1parser.h @@ -4,9 +4,9 @@ #ifndef ASN1PARSER_H #define ASN1PARSER_H -#ifdef HAVE_CONFIG_H +#ifdef HAVE_ASN1C_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ +#endif /* HAVE_ASN1C_CONFIG_H */ #include "asn1_ref.h" #include "asn1_buffer.h" diff --git a/skeletons/asn_system.h b/skeletons/asn_system.h index 194f96a5f..624bffe7a 100644 --- a/skeletons/asn_system.h +++ b/skeletons/asn_system.h @@ -8,7 +8,7 @@ #ifndef ASN_SYSTEM_H #define ASN_SYSTEM_H -#ifdef HAVE_CONFIG_H +#ifdef HAVE_ASN1C_CONFIG_H #include "config.h" #endif diff --git a/skeletons/converter-example.c b/skeletons/converter-example.c index d4ba92e50..7e1474419 100644 --- a/skeletons/converter-example.c +++ b/skeletons/converter-example.c @@ -7,7 +7,7 @@ * * cc -DPDU=MyCustomType -o myDecoder.o -c converter-example.c */ -#ifdef HAVE_CONFIG_H +#ifdef HAVE_ASN1C_CONFIG_H #include #endif #define __EXTENSIONS__