add a simple g_strlcat define in strutil for gtk==1 where this symbol does not...

svn path=/trunk/; revision=16511

diff --git a/asn1/x411/packet-x411-template.c b/asn1/x411/packet-x411-template.c
index 58c90a98bfe64e46218f4523064029e3ef03ff62..237ff8f3dafee65ab748e9147f7575ce95e7c7c6 100644 (file)
--- a/asn1/x411/packet-x411-template.c
+++ b/asn1/x411/packet-x411-template.c
@@ -46,6 +46,7 @@
 
 #include "packet-x411.h"
 #include <epan/emem.h>
+#include <epan/strutil.h>
 
 #define PNAME  "X.411 Message Transfer Service"
 #define PSNAME "X411"

diff --git a/asn1/x509if/packet-x509if-template.c b/asn1/x509if/packet-x509if-template.c
index 847231eebeedfb896f5c4307b95881dea79b77be..905803bcdb2b0cdef1a6ef56def24782d7a830d4 100644 (file)
--- a/asn1/x509if/packet-x509if-template.c
+++ b/asn1/x509if/packet-x509if-template.c
@@ -37,6 +37,7 @@
 #include "packet-x509if.h"
 #include "packet-ber.h"
 #include "packet-x509sat.h"
+#include <epan/strutil.h>
 
 #define PNAME  "X.509 Information Framework"
 #define PSNAME "X509IF"

diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c
index 0b4ee643d6c143ecaef633f00272cd347002e86f..749f2429a023e648a56a25c80a39251857943204 100644 (file)
--- a/epan/dissectors/packet-x411.c
+++ b/epan/dissectors/packet-x411.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-x411.c                                                            */
+/* ./packet-x411.c                                                            */
 /* ../../tools/asn2eth.py -X -b -e -p x411 -c x411.cnf -s packet-x411-template x411.asn */
 
 /* Input file: packet-x411-template.c */
@@ -53,6 +53,7 @@
 
 #include "packet-x411.h"
 #include <epan/emem.h>
+#include <epan/strutil.h>
 
 #define PNAME  "X.411 Message Transfer Service"
 #define PSNAME "X411"

diff --git a/epan/dissectors/packet-x411.h b/epan/dissectors/packet-x411.h
index cde0bd740843350df01bfdb33d1daa924ff3270b..4477b3c394fad9e3e7ba8cf002d213cd0bc9128d 100644 (file)
--- a/epan/dissectors/packet-x411.h
+++ b/epan/dissectors/packet-x411.h
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-x411.h                                                            */
+/* ./packet-x411.h                                                            */
 /* ../../tools/asn2eth.py -X -b -e -p x411 -c x411.cnf -s packet-x411-template x411.asn */
 
 /* Input file: packet-x411-template.h */

diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c
index 8f73c404373f763a7b9ec32fcb3f07b9f1432089..324ff6135b8ed7f490d9efd728231c69916b461b 100644 (file)
--- a/epan/dissectors/packet-x509if.c
+++ b/epan/dissectors/packet-x509if.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-x509if.c                                                          */
+/* ./packet-x509if.c                                                          */
 /* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
 
 /* Input file: packet-x509if-template.c */
@@ -44,6 +44,7 @@
 #include "packet-x509if.h"
 #include "packet-ber.h"
 #include "packet-x509sat.h"
+#include <epan/strutil.h>
 
 #define PNAME  "X.509 Information Framework"
 #define PSNAME "X509IF"

diff --git a/epan/dissectors/packet-x509if.h b/epan/dissectors/packet-x509if.h
index d5b0920f962628bf2e8126aa39928d5b2a5c060f..5e510a6c6c2c78343349461899db2a3489186098 100644 (file)
--- a/epan/dissectors/packet-x509if.h
+++ b/epan/dissectors/packet-x509if.h
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-x509if.h                                                          */
+/* ./packet-x509if.h                                                          */
 /* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
 
 /* Input file: packet-x509if-template.h */

diff --git a/epan/strutil.h b/epan/strutil.h
index 17331510408e3e9b2cd56da11e4cdb54747253c6..dceeabe76b555a8c6b1de4933d26c3b1bffc6917 100644 (file)
--- a/epan/strutil.h
+++ b/epan/strutil.h
@@ -144,4 +144,16 @@ guint8 * convert_string_to_hex(const char *string, size_t *nbytes);
  */
 char * convert_string_case(const char *string, gboolean case_insensitive);
 
+/* g_strlcat() does not exist in gtk 1 */
+#if GTK_MAJOR_VERSION < 2
+#define g_strlcat(dst, src, size)                                      \
+       {                                                               \
+       int strl;                                                       \
+       strl=strlen(dst);                                               \
+       if(strl<size)                                                   \
+               g_snprintf(dst+strl, size-strl, "%s", src);             \
+       dst[size-1]=0;                                                  \
+       }
+#endif
+
 #endif /* __STRUTIL_H__ */