Commit Graph

158 Commits

Author SHA1 Message Date
Jeff Morriss abc482e578 Revert r45018 and r45019: put config.h back in lemon.c and take _U_ back off
the compile line when building with cmake.

Put _U_'s definition in config.h when building with autofoo and on Windows.

svn path=/trunk/; revision=45034
2012-09-21 01:42:03 +00:00
Bill Meier 4faf909267 Add a missing C comment termination; (Should fix buildbot error ?)
svn path=/trunk/; revision=45031
2012-09-20 20:49:20 +00:00
Bill Meier 60f3fcbb0c Fix a typo in SVN #44995 which caused building Wireshark with VS 2012 to fail.
svn path=/trunk/; revision=45029
2012-09-20 20:07:21 +00:00
Bill Meier 0a04950fe7 Add VC11 (VS2012) to an '#if _MSC_VER == 1500 || ...' test.
TBD: is really required.

svn path=/trunk/; revision=44995
2012-09-19 00:07:01 +00:00
Jeff Morriss d8a0279ea0 From Chris Maynard via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6134 :
Add VERSION_MAJOR, VERSION_MINOR, and VERSION_MICRO to the config.h on
Windows (actually Chris' patch included VERSION_BUILD and VERSION_EXTRA but
I've left those out to match what we have on *NIX now).

svn path=/trunk/; revision=44988
2012-09-18 21:52:00 +00:00
Jörg Mayer fcb0307fae The name configure.in has been deprecated for many years.
Use configure.ac instead.

svn path=/trunk/; revision=44630
2012-08-23 11:11:24 +00:00
Anders Broman e6e6d6217b From Tony Trinh:
Update Lua from 5.1 to 5.2

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7400

svn path=/trunk/; revision=43482
2012-06-25 20:42:07 +00:00
Jörg Mayer 41232f172e Remove HAVE_WIRELESS_TOOLBAR from the other build systems.
svn path=/trunk/; revision=43419
2012-06-20 19:11:55 +00:00
Anders Broman 227eb36c83 Start to have an generic wireless toolbar. Sligtly modified patch from
Pontus Fuchs.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6973

svn path=/trunk/; revision=43354
2012-06-19 12:42:06 +00:00
Gerald Combs 23a520237b Add initial support for Qt along with a "ui" subdirectory.
svn path=/trunk/; revision=40378
2012-01-04 22:13:01 +00:00
Gerald Combs 7d442f4c22 Change the use of threads from "mostly always, depending on your
configure options and Gtk+ and GLib versions" to "always".

svn path=/trunk/; revision=39751
2011-11-07 23:42:53 +00:00
Gerald Combs d40223b6fb Add a HAVE_GEOIP_V6 configuration option and enable it by default.
svn path=/trunk/; revision=39283
2011-10-05 23:02:31 +00:00
Jörg Mayer 576ab168c9 Get rid of (hopefully) all configure options to enable MAIN_MENU_USE_UIMANAGER
as it is the only option left.

svn path=/trunk/; revision=39138
2011-09-25 21:27:19 +00:00
Guy Harris 5689955e8e Move the *pcap stuff together. Add an item for
HAVE_PCAP_GET_SELECTABLE_FD to make it clear that it is never defined on
Windows.

svn path=/trunk/; revision=38380
2011-08-06 18:36:46 +00:00
Stig Bjørlykke ffd28912d3 Another fix for building with MSVC2005.
The previous fixes in r37728 and r37730 did build a wireshark which was
unable to use the native windows file dialog (GetOpenFileName).

svn path=/trunk/; revision=38299
2011-08-01 12:38:58 +00:00
Chris Maynard 47c271fa74 No need to define USE_THREADS twice.
svn path=/trunk/; revision=38037
2011-07-15 01:30:06 +00:00
Gerald Combs a533d70be0 On Windows enable threads everywhere instead of just in dumpcap. If
threads are enabled use them to check the recent file list. Fixes bug
3810.

svn path=/trunk/; revision=38033
2011-07-14 23:18:02 +00:00
Stig Bjørlykke 8443bbbf75 Replace all strerror() with g_strerror().
Remove our local strerror implementation.
Mark strerror as locale unsafe API.

This fixes bug 5715.

svn path=/trunk/; revision=37812
2011-06-28 09:00:11 +00:00
Gerald Combs 0501a48552 Remove old PCRE references from the Windows build environment. We're not
likely to add it back to wireshark-win32-libs and it was never available
in wireshark-win64-libs.

svn path=/trunk/; revision=37778
2011-06-23 23:04:03 +00:00
Stig Bjørlykke 440d1c4e11 AttachConsole() needs _WIN32_WINNT 0x0500.
svn path=/trunk/; revision=37730
2011-06-20 08:58:59 +00:00
Stig Bjørlykke 8f7cbf3a8b Add back support for building with MSVC2005 (and older).
svn path=/trunk/; revision=37728
2011-06-20 07:14:57 +00:00
Gerald Combs 8d88f3a790 Make pcap-ng the default. Add a compile-time option to prefer pcap-ng or
pcap.  Add a "-P" capture option which tries to use pcap instead of
pcap-ng ("-P" seemed to be the best option but we may want to use a
different letter).

Update the documentation and release notes.

svn path=/trunk/; revision=37696
2011-06-17 17:52:31 +00:00
Anders Broman 4f525e3a78 Remove HAVE_AIRPDCAP
svn path=/trunk/; revision=37495
2011-05-31 21:38:39 +00:00
Chris Maynard 10ed235707 WANT_PACKET_EDITOR fixups for Windows.
svn path=/trunk/; revision=37091
2011-05-12 17:46:54 +00:00
Jakub Zawadzki b680407847 Conditional support for packet-editor [default=no].
svn path=/trunk/; revision=37084
2011-05-12 17:14:59 +00:00
Anders Broman 50e30e3c70 Make the use of UIManager a configure option.
NOTE Only for Windows.

Additional moves to UIManager.

svn path=/trunk/; revision=37072
2011-05-12 10:56:26 +00:00
Jeff Morriss 6ff4737f44 On Windows: don't (try but fail--the code did not work) to define
HAVE_GZLCEARERR.  Define HAVE_INFLATEPRIME if we HAVE_LIBZ.

svn path=/trunk/; revision=36954
2011-04-29 17:30:23 +00:00
Bill Meier dbc7c80782 Remove the 'NEW_PACKET_LIST' defines & etc (since the code no longer supports the old packet list)
svn path=/trunk/; revision=36165
2011-03-08 14:55:07 +00:00
Gerald Combs cb3aa2b633 Disable Code Analysis warning C6011 for now. Hopefully Clang can pick
up the slack.

svn path=/trunk/; revision=35994
2011-02-18 00:33:35 +00:00
Guy Harris b4f663a29b On Windows, try putting __declspec(noreturn) in front of declarations of
routines that don't return.  (This requires that some files include
config.h to get WS_MSVC_NORETURN declared properly.)

svn path=/trunk/; revision=35989
2011-02-17 23:11:49 +00:00
Stephen Fisher d98194ca3e Fix typo in comment
svn path=/trunk/; revision=35037
2010-11-27 01:13:25 +00:00
Stephen Fisher 6b7aa68613 Define HAVE_GTK in config.h when compiling with GTK for the GUI
svn path=/trunk/; revision=35036
2010-11-26 23:50:56 +00:00
Sake Blok 6c97a708c9 Make "bpf_image" available on Windows. This enables the "Compile BPF" button and "dumpcap -d" on Windows.
svn path=/trunk/; revision=34357
2010-10-03 22:42:27 +00:00
Sake Blok f3e94f6753 Retry of SVN 34338, now tested on my WinXP dev VM:
Use pcap_open_dead instead of pcap_create for the compile BPF button. 



svn path=/trunk/; revision=34340
2010-10-03 12:04:18 +00:00
Bill Meier 45964ddc65 New packet list is no longer experimental.
svn path=/trunk/; revision=33876
2010-08-21 13:48:52 +00:00
Gerald Combs fe79af8f42 From Kovarththanan Rajaratnam via bug 3500:
Sébastien's initial commit [1] didn't contain support for embedding Python on
Windows.

[1] http://anonsvn.wireshark.org/viewvc?view=rev&revision=28529


From me:

Comment out PYTHON_EMBED for now.

Start a list of known Python+CRT versions.

Add get_wspython_dir to libwireshark.def.

svn path=/trunk/; revision=33036
2010-06-01 22:20:15 +00:00
Bill Meier 808a95b14e Some changes req'd to build Wireshark with VS 2010 (VC10). [More changes still needed].
svn path=/trunk/; revision=32468
2010-04-14 21:56:00 +00:00
Guy Harris 4827f975cb Add HAVE_PCAP_FREE_DATALINKS to config.h.win32, as we've added it to
config.nmake and Makefile.nmake.

svn path=/trunk/; revision=32224
2010-03-17 19:31:19 +00:00
Gerald Combs 8fc1491a60 Switch to using a bundled version of the openSUSE Build Service packages
for GNUTLS since they provide 32-bit and 64-bit Windows packages. We no
longer have winposixtype.h, so remove its #includes and add a ssize_t
typedef to config.h.win32.

svn path=/trunk/; revision=31341
2009-12-21 21:06:01 +00:00
Gerald Combs 7046509b99 Use the WinPcap version of pcap_datalink_val_to_description if it's
present.  Add an entry for DLT_PPI in case it's not.

svn path=/trunk/; revision=31316
2009-12-18 20:36:36 +00:00
Guy Harris 488253bfe7 Add the time zone abbreviation to the result of abs_time_to_str() and
abs_time_secs_to_str().

svn path=/trunk/; revision=31234
2009-12-11 03:39:17 +00:00
Stig Bjørlykke 98024a007f Invert check for getopt: NEED_GETOPT_H -> HAVE_GETOPT_H
Rename getopt.[ch] -> wsgetopt.[ch] to avoid name collision.

svn path=/trunk/; revision=30370
2009-10-06 16:01:18 +00:00
Kovarththanan Rajaratnam 2547ce21bf We no longer support the old plugin API so remove it completely from the build system
svn path=/trunk/; revision=29821
2009-09-09 14:01:57 +00:00
Kovarththanan Rajaratnam 974849a9a0 Remove strcasecmp. We use g_ascii_strcasecmp exclusively
svn path=/trunk/; revision=29643
2009-08-31 19:47:50 +00:00
Kovarththanan Rajaratnam 612f839c1f Reorder (no functionality change)
svn path=/trunk/; revision=29640
2009-08-31 18:59:21 +00:00
Kovarththanan Rajaratnam dc958a440b Remove PRId64, PRIu64, PRIx64, PRIX64, and PRIo64 which are unused
svn path=/trunk/; revision=29638
2009-08-31 18:38:07 +00:00
Kovarththanan Rajaratnam 499695595e Remove superfluous config parameters
svn path=/trunk/; revision=29633
2009-08-30 18:30:14 +00:00
Kovarththanan Rajaratnam b4e821bf0f Remove outdated comments regarding ZLIB_DLL. We don't have to define this before including zlib.h. This is automatically done if _WIN32 is defined
svn path=/trunk/; revision=29632
2009-08-30 17:23:47 +00:00
Kovarththanan Rajaratnam 59a1af9c99 Add a couple of comments to HAVE_DIRECT_H, HAVE_WINDOWS_H and HAVE_WINSOCK2_H
svn path=/trunk/; revision=29631
2009-08-30 17:09:40 +00:00
Kovarththanan Rajaratnam 42c0ca3ca7 We require WinPcap > 3.0 so get rid of WPCAP_CONSTIFIED_CONFIG
svn path=/trunk/; revision=29616
2009-08-29 08:19:16 +00:00