diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-09-03 18:14:00 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-09-03 18:14:00 +0000 |
| commit | dfad2b94f5fa40db86bd11e475c310751efafe69 (patch) | |
| tree | 52e7356882f6648b61bf937b258a6ebcffc54e65 /epan/Makefile.am | |
| parent | 4e3b6fb31568d2a767c4f977b8954e124caec30c (diff) | |
| download | wireshark-dfad2b94f5fa40db86bd11e475c310751efafe69.tar.gz wireshark-dfad2b94f5fa40db86bd11e475c310751efafe69.tar.bz2 wireshark-dfad2b94f5fa40db86bd11e475c310751efafe69.zip | |
Some UN*Xes don't have any "strtou*" routine to convert a string to a
64-bit integer; use "g_ascii_strtoull()", and, in the configure script,
check whether it's available in GLib (it's not in GLib 1.2[.x]) and, if
not, supply the GLib 2.4.5 version of the routine.
For G_MAXUINT32 and G_MAXUINT64, put a "U" at the end of the constant to
explicitly flag it as unsigned.
svn path=/trunk/; revision=11889
Diffstat (limited to 'epan/Makefile.am')
| -rw-r--r-- | epan/Makefile.am | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am index 4a96dff9d6..933e653fd2 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -42,7 +42,9 @@ libethereal_la_SOURCES = \ $(DISSECTOR_SUPPORT_SRC) EXTRA_libethereal_la_SOURCES = \ - inet_aton.c \ + g_ascii_strtoull.c \ + g_ascii_strtoull.h \ + inet_aton.c \ inet_pton.c \ inet_ntop.c \ inet_aton.h \ @@ -67,8 +69,8 @@ MAINTAINERCLEANFILES = \ # # Add the object files for missing routines, if any. # -libethereal_la_LIBADD = @INET_ATON_O@ @INET_PTON_O@ @INET_NTOP_O@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la -libethereal_la_DEPENDENCIES = @INET_ATON_O@ @INET_PTON_O@ @INET_NTOP_O@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la +libethereal_la_LIBADD = @G_ASCII_STRTOULL_O@ @INET_ATON_O@ @INET_PTON_O@ @INET_NTOP_O@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la +libethereal_la_DEPENDENCIES = @G_ASCII_STRTOULL_O@ @INET_ATON_O@ @INET_PTON_O@ @INET_NTOP_O@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la tvbtest: tvbtest.o tvbuff.o except.o strutil.o $(LINK) -o tvbtest tvbtest.o tvbuff.o except.o strutil.o `glib-config --libs` |