summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2010-07-18 23:15:24 +0200
committerHarald Welte <laforge@gnumonks.org>2010-07-20 00:05:07 +0200
commitfa034009a11b0ea5f91074e6137e8711240217a6 (patch)
tree43d6fbed6f5301946749e6140600f09bddc6f23a /src
parentec0e217b0647eb798576a7d3366b39c159c00624 (diff)
Convert libasn1c to use talloc from libosmocore
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am3
-rw-r--r--src/asn_codecs_prim.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index dcad645..d4e105e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,9 +4,10 @@
LIBVERSION=0:0:0
INCLUDES = $(all_includes) -I$(top_srcdir)/include/asn1c
-AM_CFLAGS = -fPIC -Wall
+AM_CFLAGS = -fPIC -Wall $(LIBOSMOCORE_CFLAGS)
lib_LTLIBRARIES = libasn1c.la
+libasn1c_la_LDFLAGS = $(LIBOSMOCORE_LIBS)
libasn1c_la_SOURCES = ANY.c constraints.c GeneralizedTime.c NumericString.c T61String.c asn_codecs_prim.c constr_CHOICE.c GeneralString.c ObjectDescriptor.c TeletexString.c asn_SEQUENCE_OF.c constr_SEQUENCE.c GraphicString.c OBJECT_IDENTIFIER.c UniversalString.c asn_SET_OF.c constr_SEQUENCE_OF.c IA5String.c OCTET_STRING.c UTCTime.c ber_decoder.c constr_SET.c INTEGER.c per_decoder.c UTF8String.c ber_tlv_length.c constr_SET_OF.c ISO646String.c per_encoder.c VideotexString.c ber_tlv_tag.c constr_TYPE.c NativeEnumerated.c per_support.c VisibleString.c BIT_STRING.c NativeInteger.c PrintableString.c xer_decoder.c BMPString.c der_encoder.c NativeReal.c REAL.c xer_encoder.c BOOLEAN.c ENUMERATED.c NULL.c RELATIVE-OID.c xer_support.c per_opentype.c
diff --git a/src/asn_codecs_prim.c b/src/asn_codecs_prim.c
index 4e5c639..a9bc10d 100644
--- a/src/asn_codecs_prim.c
+++ b/src/asn_codecs_prim.c
@@ -6,6 +6,8 @@
#include <asn_codecs_prim.h>
#include <errno.h>
+void *talloc_asn1_ctx;
+
/*
* Decode an always-primitive type.
*/