blob: ad8a40ccf87970a9199436d402be65190abc8acd [file] [log] [blame]
Patrick Williamsb48b7b42016-08-17 15:04:38 -05001Fixed build error with gcc 4.8
2
3Errors like below
4
5egg-asn1x.c: In function 'anode_encode_build':
6egg-asn1x.c:1280:7: warning: variable 'type' set but not used [-Wunused-but-set-variable]
7egg-asn1x.c: In function 'traverse_and_prepare':
8egg-asn1x.c:3354:3: warning: passing argument 1 of 'egg_asn1x_create' from incompatible pointer type [enabled by default]
9In file included from egg-asn1x.c:50:0:
10egg-asn1x.h:38:8: note: expected 'const struct static_struct_asn *' but argument is of type 'const struct asn1_static_node *'
11egg-asn1x.c: At top level:
12egg-asn1x.c:3509:1: error: conflicting types for 'egg_asn1x_create'
13In file included from egg-asn1x.c:50:0:
14egg-asn1x.h:38:8: note: previous declaration of 'egg_asn1x_create' was here
15egg-asn1x.c:3572:1: error: conflicting types for 'egg_asn1x_create_quark'
16In file included from egg-asn1x.c:50:0:
17egg-asn1x.h:41:8: note: previous declaration of 'egg_asn1x_create_quark' was here
18egg-asn1x.c:3579:1: error: conflicting types for 'egg_asn1x_create_and_decode'
19In file included from egg-asn1x.c:50:0:
20egg-asn1x.h:44:8: note: previous declaration of 'egg_asn1x_create_and_decode' was here
21make[4]: *** [libegg_la-egg-asn1x.lo] Error 1
22
23
24Signed-off-by: Khem Raj <raj.khem@gmail.com>
25
26Upstream-Status: Pending
27Index: gnome-keyring-2.32.1/egg/egg-asn1x.h
28===================================================================
29--- gnome-keyring-2.32.1.orig/egg/egg-asn1x.h 2010-10-18 19:11:38.000000000 -0700
30+++ gnome-keyring-2.32.1/egg/egg-asn1x.h 2013-06-11 15:15:00.675399263 -0700
31@@ -25,6 +25,7 @@
32 #define EGG_ASN1X_H_
33
34 #include <glib.h>
35+#include <libtasn1.h>
36
37 #ifndef HAVE_EGG_ALLOCATOR
38 typedef void* (*EggAllocator) (void* p, gsize);
39@@ -35,13 +36,13 @@
40
41 struct static_struct_asn;
42
43-GNode* egg_asn1x_create (const struct static_struct_asn *defs,
44+GNode* egg_asn1x_create (const ASN1_ARRAY_TYPE *defs,
45 const gchar *type);
46
47-GNode* egg_asn1x_create_quark (const struct static_struct_asn *defs,
48+GNode* egg_asn1x_create_quark (const ASN1_ARRAY_TYPE *defs,
49 GQuark type);
50
51-GNode* egg_asn1x_create_and_decode (const struct static_struct_asn *defs,
52+GNode* egg_asn1x_create_and_decode (const ASN1_ARRAY_TYPE *defs,
53 const gchar *type,
54 gconstpointer data,
55 gsize n_data);