Commit Graph

88 Commits

Author SHA1 Message Date
Gerald Combs 49b92440de More GLIB_CHECK_VERSION cleanups. Update the minimum GLib/GTK+ versions
in README.devloper. Remove g_gnuc.h since it's no longer needed. Remove
tvbuff_init(), tvbuff_cleanup(), reassemble_init(), and
reassemble_cleanup() since they were only used for older GLib versions
which didn't support GSlices. Assume we always support the "matches"
operator.

svn path=/trunk/; revision=37978
2011-07-11 20:32:19 +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 349273944d Add links to libtool's recommendations for library versions.
svn path=/trunk/; revision=37582
2011-06-06 21:40:40 +00:00
Balint Reczey 9fe47db306 Reorganize dumpabi targets to keep temporary files
svn path=/trunk/; revision=37540
2011-06-04 16:44:37 +00:00
Balint Reczey 81849d7682 Fixing wrong library names in r37474
svn path=/trunk/; revision=37475
2011-05-31 12:09:47 +00:00
Balint Reczey 8ac6683629 Add dumpabi target to Makefiles in wsutil, epan and wiretap directories.
We can use the dumped ABI description for comparing ABI changes between revisions.

svn path=/trunk/; revision=37474
2011-05-31 12:07:25 +00:00
Gerald Combs 962b23f8d5 Filter out arg_list_utf_16to8.
svn path=/trunk/; revision=37396
2011-05-25 18:38:39 +00:00
Gerald Combs a24687ce8e Move the Windows argument list conversion code to a common routine.
svn path=/trunk/; revision=37372
2011-05-24 00:07:56 +00:00
Guy Harris f10a13b748 We have to define ws_statb64 before declaring routines that use it.
svn path=/trunk/; revision=36550
2011-04-10 23:51:34 +00:00
Guy Harris a6fc7f14c4 To fill in a ws_statb64, you must use ws_fstat64.
Declare ws_stdio_stat64, as that's its new name.

svn path=/trunk/; revision=36549
2011-04-10 22:04:14 +00:00
Guy Harris 83f6659cdb ws_stdio_stat got renamed to ws_stdio_stat64.
svn path=/trunk/; revision=36548
2011-04-10 21:36:05 +00:00
Guy Harris 4fdcc5c180 Rename ws_stat to ws_stat64, and make it take a pointer to a ws_statb64
as an argument, along the lines of ws_fstat64, and, on Windows, make it
use _wstati64, to handle 64-bit file sizes.

svn path=/trunk/; revision=36547
2011-04-10 20:59:10 +00:00
Guy Harris f2008e4dd3 Define ws_statb64 as struct stat *within* the "not Windows" block.
svn path=/trunk/; revision=36546
2011-04-10 20:51:58 +00:00
Guy Harris 0629b7399a Define ws_statb64 to be the appropriate "struct XXX" for a
64-bit-file-size-capable stat call, and use it for ws_fstat64().

svn path=/trunk/; revision=36545
2011-04-10 19:56:06 +00:00
Guy Harris 71d4caa5b9 Add ws_fstat64(), defined to be fstat on UN*X and _fstati64 on Windows.
Use it in some places where we're getting the file size.

svn path=/trunk/; revision=36544
2011-04-10 18:55:06 +00:00
Guy Harris c349caf925 Use AC_SYS_LARGEFILE to turn on large file support on platforms that
support it.

Rename ws_lseek to ws_lseek64, as it should be given a 64-bit offset,
and have it use _lseeki64 on Windows, to try to get 64-bit offset
support; AC_SYS_LARGEFILE should cause lseek() to support 64-bit offsets
on UN*X if possible.

svn path=/trunk/; revision=36542
2011-04-10 18:22:47 +00:00
Guy Harris 6c6f3528f1 Squelch a warning from the MSVC++ static analyzer (it's worried that
GetModuleHandle() could return a null pointer, which is possible,
although if it returns one when handed "kernel32.dll", you have bigger
problems...).

Add some comments.

svn path=/trunk/; revision=35972
2011-02-17 03:02:18 +00:00
Bill Meier d3efa3ed9f A bit of Windows makefiles rework and cleanup:
- 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 ...

svn path=/trunk/; revision=35747
2011-02-02 01:19:53 +00:00
Bill Meier b0aac9d9c2 WIN32 ==> _WIN32
svn path=/trunk/; revision=35745
2011-02-01 23:02:54 +00:00
Balint Reczey 5dc1634248 Update filter for Windows-only symbols.
svn path=/trunk/; revision=35203
2010-12-16 17:22:17 +00:00
Balint Reczey 7f690fd086 Export only defined symbols from libwsutil.
Exported symbols are the symbols listed in libwsutil.def, but the
symbols defined in not used optional objects are filtered out.

svn path=/trunk/; revision=35202
2010-12-16 16:42:34 +00:00
Jeff Morriss ab75652d59 Include stdlib.h for getenv().
svn path=/trunk/; revision=35149
2010-12-07 20:45:22 +00:00
Jeff Morriss ad47f04c94 Move getenv_utf8() to wsutil.
svn path=/trunk/; revision=35148
2010-12-07 20:24:57 +00:00
Jeff Morriss d6eff0493c Revert rev 35145 for wsutil: go back to exporting all symbols. libwsutil's 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.
svn path=/trunk/; revision=35147
2010-12-07 18:31:50 +00:00
Balint Reczey 8b4573f705 Make libtool export only symbols listed in *.def files
svn path=/trunk/; revision=35145
2010-12-07 13:38:15 +00:00
Stephen Fisher 462245684a Add extern "C" to more header files.
svn path=/trunk/; revision=35093
2010-12-01 18:25:18 +00:00
Stephen Fisher efc64e43f6 Add #ifndef __PRIVILEGES_H__ / #define / #endif logic to prevent multiple
inclusions of privileges.h.


svn path=/trunk/; revision=35092
2010-12-01 18:16:41 +00:00
Balint Reczey 772161973c Add libtool version info to libwsutil.
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

svn path=/trunk/; revision=35030
2010-11-25 23:00:16 +00:00
Gerald Combs 68974e890a Make sure we pass a directory path and not a file path to
SetCurrentDirectory.  Should fix bug 5420.

svn path=/trunk/; revision=35010
2010-11-22 20:43:22 +00:00
Jörg Mayer de68ad3066 H. Sivank <hsivank@gmail.com>
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.


svn path=/trunk/; revision=34201
2010-09-23 07:02:33 +00:00
Gerald Combs 8b1205bac4 More typos.
svn path=/trunk/; revision=34139
2010-09-16 19:56:34 +00:00
Gerald Combs 15e9e06448 Fix a typo.
svn path=/trunk/; revision=34138
2010-09-16 19:55:25 +00:00
Gerald Combs a87bdf9660 Turn on ASLR via /DYNAMICBASE and DEP via SetProcessDEPPolicy().
svn path=/trunk/; revision=34137
2010-09-16 19:20:06 +00:00
Jeff Morriss e8bee3d12e Also rename inet_ntop() on Windows
svn path=/trunk/; revision=34129
2010-09-15 21:41:27 +00:00
Jeff Morriss 71fca3c87f Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5160 differently:
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.

svn path=/trunk/; revision=34122
2010-09-15 15:13:40 +00:00
Gerald Combs 5aae07254f Forward-port r33953.
Move the SetDllDirectory calls to ws_init_dll_search_path. If
SetDllDirectory fails, pass the Wireshark program path to
SetCurrentDirectory.

svn path=/trunk/; revision=33958
2010-08-27 19:24:44 +00:00
Gerald Combs 88a0298183 Add a newline. Fixup whitespace.
svn path=/trunk/; revision=33933
2010-08-26 17:18:44 +00:00
Gerald Combs 58f1427305 Move Windows-specific material inside an appropriate #ifdef.
svn path=/trunk/; revision=33925
2010-08-25 22:41:26 +00:00
Gerald Combs 607b228df6 Add ws_load_library and ws_module_open, which respectively call
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.

svn path=/trunk/; revision=33924
2010-08-25 20:30:59 +00:00
Jeff Morriss d19f63e8f8 Include glib.h (for g_snprintf).
svn path=/trunk/; revision=33019
2010-05-29 03:35:32 +00:00
Jeff Morriss 7cfd2c66f9 Add braces to avoid an ambiguous else
svn path=/trunk/; revision=33018
2010-05-29 03:34:05 +00:00
Jeff Morriss 403e4e62a4 Put the optional objects in EXTRA..SOURCES instead of EXTRA_DIST.
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.

svn path=/trunk/; revision=33017
2010-05-29 03:33:28 +00:00
Jeff Morriss baee0e77fe Make inet_aton an optional object on *NIX again
svn path=/trunk/; revision=33016
2010-05-29 01:00:52 +00:00
Jeff Morriss 600d32434f Add a missing variable from wsgetopt
svn path=/trunk/; revision=33013
2010-05-28 20:37:18 +00:00
Jeff Morriss 47e2d75820 Move some code (including the optional objects) into libwsutil
svn path=/trunk/; revision=33012
2010-05-28 20:19:55 +00:00
Jörg Mayer 96779de920 cmake changes:
- 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.


svn path=/trunk/; revision=32231
2010-03-18 10:27:17 +00:00
Jörg Mayer d2cc318f4f Beginnings of enabling static builds. Still to do:
* Add -static
* Registration may need different handling
* Add plugins
* Build error in wslua

svn path=/trunk/; revision=30987
2009-11-17 11:58:36 +00:00
Jörg Mayer b7ce60b95a Hopefully fix wsutil build on OSX.
svn path=/trunk/; revision=30091
2009-09-23 15:08:32 +00:00
Kovarththanan Rajaratnam 418699b85d Add utf_8to16_snprintf() which creates a UTF16 string according to the given 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.
svn path=/trunk/; revision=29635
2009-08-31 18:16:16 +00:00
Kovarththanan Rajaratnam 13df2a878b On Windows a shared library in divided into a DLL part (RUNTIME) and an import lib (ARCHIVE).
svn path=/trunk/; revision=29622
2009-08-30 07:09:29 +00:00