aboutsummaryrefslogtreecommitdiffstats
path: root/wsutil
AgeCommit message (Collapse)AuthorFilesLines
2011-02-02A bit of Windows makefiles rework and cleanup:wmeier1-4/+3
- Define macros for certain CFLAGS in config.nmake iso of having defs in each makefile; a. -DHAVE_CONFIG_H and -D_U_="" are now part of a macro named STANDARD_CFLAGS; b. -WX has been replaced by WARNINGS_ARE_ERRORS (defined as -WX in config.nmake) (This allows disabling "Warnings as Errors" by just changing config.nmake) c. CVARSDLL definitions (not usage) have been removed from the various makefiles. XXX: It appears the usage of CVARSDLL can also be removed (not yet done) since: -DWIN32 and -DNULL=0 do not appear to be needed (any more); -D_MT and _D_DLL are not needed since /MP causes these definitions. d. Define a macro WARNINGS_CFLAGS with additional specific compiler (level4) warnings to be enabled. E.G., 4295: array is too small to include a terminating null character - config.nmake: reformat some long lines for readability; - plugins\Makefile.nmake: clean-deps does nothing: remove it (and usage in top-level makefile); - dissectors/Makefile.nmake: test to enable packet-rrc.obj target needs to include MSVC2010 ... git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35747 f5534014-38df-0310-8fa8-9805f1628bb7
2011-02-01WIN32 ==> _WIN32wmeier2-4/+4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35745 f5534014-38df-0310-8fa8-9805f1628bb7
2010-12-16Update filter for Windows-only symbols.rbalint1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35203 f5534014-38df-0310-8fa8-9805f1628bb7
2010-12-16Export only defined symbols from libwsutil.rbalint1-13/+58
Exported symbols are the symbols listed in libwsutil.def, but the symbols defined in not used optional objects are filtered out. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35202 f5534014-38df-0310-8fa8-9805f1628bb7
2010-12-07Include stdlib.h for getenv().morriss1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35149 f5534014-38df-0310-8fa8-9805f1628bb7
2010-12-07Move getenv_utf8() to wsutil.morriss4-7/+60
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35148 f5534014-38df-0310-8fa8-9805f1628bb7
2010-12-07Revert rev 35145 for wsutil: go back to exporting all symbols. libwsutil's ↵morriss1-6/+2
list of exported symbols includes our optional targets and trying to export symbols that don't (always) exist upsets some linkers. Anyway, the list of global symbols in libwsutil is (so far) quite short. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35147 f5534014-38df-0310-8fa8-9805f1628bb7
2010-12-07Make libtool export only symbols listed in *.def filesrbalint1-2/+6
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35145 f5534014-38df-0310-8fa8-9805f1628bb7
2010-12-01Add extern "C" to more header files.sfisher1-0/+8
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35093 f5534014-38df-0310-8fa8-9805f1628bb7
2010-12-01Add #ifndef __PRIVILEGES_H__ / #define / #endif logic to prevent multiplesfisher1-0/+5
inclusions of privileges.h. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35092 f5534014-38df-0310-8fa8-9805f1628bb7
2010-11-25Add libtool version info to libwsutil.rbalint1-0/+1
From Eloy Paris <peloy@debian.org> http://svn.debian.org/wsvn/collab-maint/ext-maint/wireshark/branches/wireshark-1.4.x%2Blibseparation/debian/patches/25_libwsutil-version.patch git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35030 f5534014-38df-0310-8fa8-9805f1628bb7
2010-11-22Make sure we pass a directory path and not a file path togerald1-5/+9
SetCurrentDirectory. Should fix bug 5420. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35010 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-23H. Sivank <hsivank@gmail.com>jmayer1-1/+1
I try to configure Wireshark with cmake on macosx 10.6. It fails with : set_target_properties called with incorrect number of arguments. Attached a patch to fix this issue. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34201 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-16More typos.gerald1-3/+3
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34139 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-16Fix a typo.gerald1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34138 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-16Turn on ASLR via /DYNAMICBASE and DEP via SetProcessDEPPolicy().gerald3-9/+20
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34137 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-15Also rename inet_ntop() on Windowsmorriss2-5/+7
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34129 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-15Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5160 differently:morriss2-1/+12
On Windows, rename inet_pton() to ws_inet_pton() so that builds on Vista or later systems (that have inet_pton() natively) will still work on pre-Vista systems. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34122 f5534014-38df-0310-8fa8-9805f1628bb7
2010-08-27Forward-port r33953.gerald3-0/+30
Move the SetDllDirectory calls to ws_init_dll_search_path. If SetDllDirectory fails, pass the Wireshark program path to SetCurrentDirectory. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33958 f5534014-38df-0310-8fa8-9805f1628bb7
2010-08-26Add a newline. Fixup whitespace.gerald1-7/+7
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33933 f5534014-38df-0310-8fa8-9805f1628bb7
2010-08-25Move Windows-specific material inside an appropriate #ifdef.gerald1-17/+17
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33925 f5534014-38df-0310-8fa8-9805f1628bb7
2010-08-25Add ws_load_library and ws_module_open, which respectively callgerald3-2/+134
LoadLibrary and g_module_open only for the program directory and system directory on Windows. Use them to replace a bunch of LoadLibrary and g_module_open calls. Use the extension ".dll" for all the DLLs that we load. Add comments about DLL loading in Python. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33924 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-29Include glib.h (for g_snprintf).morriss1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33019 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-29Add braces to avoid an ambiguous elsemorriss1-1/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33018 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-29Put the optional objects in EXTRA..SOURCES instead of EXTRA_DIST.morriss2-21/+25
Put the optional objects in a _DEPENDENCIES rule so they actually get built when needed. Use libtool to make these objects. Remove AC variables that are no longer needed. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33017 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-29Make inet_aton an optional object on *NIX againmorriss3-4/+7
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33016 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-28Add a missing variable from wsgetoptmorriss1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33013 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-28Move some code (including the optional objects) into libwsutilmorriss17-8/+2849
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33012 f5534014-38df-0310-8fa8-9805f1628bb7
2010-03-18cmake changes:jmayer1-0/+1
- Add checking for linker flags - Install plugins with the name including the Wireshark version. This will make it easier to find matching plugin versions if files get just copied over. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32231 f5534014-38df-0310-8fa8-9805f1628bb7
2009-11-17Beginnings of enabling static builds. Still to do:jmayer1-5/+9
* Add -static * Registration may need different handling * Add plugins * Build error in wslua git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30987 f5534014-38df-0310-8fa8-9805f1628bb7
2009-09-23Hopefully fix wsutil build on OSX.jmayer1-0/+6
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30091 f5534014-38df-0310-8fa8-9805f1628bb7
2009-08-31Add utf_8to16_snprintf() which creates a UTF16 string according to the given ↵krj3-6/+31
format string. The format string + arguments are expected to be in UTF-8 format. This change effectively removes the only place where we use PRIu64. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29635 f5534014-38df-0310-8fa8-9805f1628bb7
2009-08-30On Windows a shared library in divided into a DLL part (RUNTIME) and an ↵krj1-2/+5
import lib (ARCHIVE). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29622 f5534014-38df-0310-8fa8-9805f1628bb7
2009-07-16Move th /MP flag setting to LOCAL_CFLAGS set in configure.nmakeetxrab1-1/+1
for MSVC variant 2008 only. As suggested by Bill Meier. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29114 f5534014-38df-0310-8fa8-9805f1628bb7
2009-07-15Add /MP flag to make use of multi cores.etxrab1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29104 f5534014-38df-0310-8fa8-9805f1628bb7
2009-06-16OK, so my last commit message was too optimistic - I was usingjmayer1-7/+12
an installed version of wsutil. dumpcap now really builds on Linux via cmake. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28754 f5534014-38df-0310-8fa8-9805f1628bb7
2009-06-15CMake now successfully builds dumpcapjmayer1-0/+38
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28745 f5534014-38df-0310-8fa8-9805f1628bb7
2009-03-08Fix ws_stdio_unlink so it works properly on WIndows for all Unicode filenames.wmeier1-5/+5
- Essentially: ws_stdio_unlink would fail trying to delete any path\filename containing a Unicode character which could not be mapped to the "system codepage" (ie: to a character encoded with a value of 1-255). For example: ws_stdio_unlink was not able to delete a path\filename containing the character U+210B. - The problem: A copy/paste of the wrong (non-Windows) portion of the GLib g_unlink code was done when file_util.c was created. - The solution: replace the ws_stdio_unlink code with the correct code copied from the Glib g_unlink function. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27661 f5534014-38df-0310-8fa8-9805f1628bb7
2009-03-06Update a commentwmeier1-3/+3
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27626 f5534014-38df-0310-8fa8-9805f1628bb7
2009-03-02More Windows compiler flag cleanups. Fix a problem with my last commitgerald1-4/+1
that would break compilation for older compilers. Create a "DLL_LDFLAGS" variable and use it in DLLs and plugins. Use PLUGIN_LDFLAGS and DLL_LDFLAGS where needed. Don't force i386 code in the TPG plugin. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27582 f5534014-38df-0310-8fa8-9805f1628bb7
2009-01-17Revise ascii...inplace to return a ptr to the string wmeier2-4/+10
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27253 f5534014-38df-0310-8fa8-9805f1628bb7
2008-12-22wtap_pcap_encap_to_wtap_encap() and wtap_wtap_encap_to_pcap_encap() wereguy1-4/+0
moved back into libwiretap. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27077 f5534014-38df-0310-8fa8-9805f1628bb7
2008-12-22Move wtap_pcap_encap_to_wtap_encap() and wtap_wtap_encap_to_pcap_encap()guy3-644/+0
back to libwiretap for now, as it's inherently tied to reading libpcap files; at some point we might want to have pcap-reading (and pcap-ng-reading?) code in a separate library, for use by, for example, dumpcap (and rawshark?). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27076 f5534014-38df-0310-8fa8-9805f1628bb7
2008-12-17commit forgotten changed filekukosa1-2/+4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27035 f5534014-38df-0310-8fa8-9805f1628bb7
2008-12-17type conversion gdouble<->guint64 is not supported in all MSVC versions, ↵kukosa3-0/+128
convert it with functions git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27032 f5534014-38df-0310-8fa8-9805f1628bb7
2008-11-16From Max Filippov:etxrab1-0/+2
patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26792 f5534014-38df-0310-8fa8-9805f1628bb7
2008-10-27ETH -> WS updates.gerald1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26570 f5534014-38df-0310-8fa8-9805f1628bb7
2008-09-19Add a newline at the end of the filemorriss1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26235 f5534014-38df-0310-8fa8-9805f1628bb7
2008-09-19Set SVN properties.gerald2-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26234 f5534014-38df-0310-8fa8-9805f1628bb7
2008-09-19Move wtap_pcap_encap_to_wtap_encap and wtap_wtap_encap_to_pcap_encap togerald4-20/+667
libwsutil. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26233 f5534014-38df-0310-8fa8-9805f1628bb7