diff options
author | Balint Reczey <balint@balintreczey.hu> | 2013-03-01 23:53:11 +0000 |
---|---|---|
committer | Balint Reczey <balint@balintreczey.hu> | 2013-03-01 23:53:11 +0000 |
commit | 1ebdb2e521ca0cbd7aeebd1c89b8a5cf6a4cc322 (patch) | |
tree | d6dde0ea7b6e6e15cc2c51a5f478fb85965b9720 /epan/ftypes/ftypes.h | |
parent | 0b8d70bfb715bc3d89b6dfae86fc79d7c4387f02 (diff) |
Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.
svn path=/trunk/; revision=47992
Diffstat (limited to 'epan/ftypes/ftypes.h')
-rw-r--r-- | epan/ftypes/ftypes.h | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/epan/ftypes/ftypes.h b/epan/ftypes/ftypes.h index 3f9907ece6..2e951e4730 100644 --- a/epan/ftypes/ftypes.h +++ b/epan/ftypes/ftypes.h @@ -28,6 +28,7 @@ #include <glib.h> #include "../emem.h" +#include "ws_symbol_export.h" #ifdef __cplusplus extern "C" { @@ -103,12 +104,14 @@ ftypes_initialize(void); /* ---------------- FTYPE ----------------- */ /* Return a string representing the name of the type */ +WS_DLL_PUBLIC const char* ftype_name(ftenum_t ftype); /* Return a string presenting a "pretty" representation of the * name of the type. The pretty name means more to the user than * that "FT_*" name. */ +WS_DLL_PUBLIC const char* ftype_pretty_name(ftenum_t ftype); @@ -116,33 +119,42 @@ ftype_pretty_name(ftenum_t ftype); int ftype_length(ftenum_t ftype); +WS_DLL_PUBLIC gboolean ftype_can_slice(enum ftenum ftype); +WS_DLL_PUBLIC gboolean ftype_can_eq(enum ftenum ftype); +WS_DLL_PUBLIC gboolean ftype_can_ne(enum ftenum ftype); +WS_DLL_PUBLIC gboolean ftype_can_gt(enum ftenum ftype); +WS_DLL_PUBLIC gboolean ftype_can_ge(enum ftenum ftype); +WS_DLL_PUBLIC gboolean ftype_can_lt(enum ftenum ftype); +WS_DLL_PUBLIC gboolean ftype_can_le(enum ftenum ftype); gboolean ftype_can_bitwise_and(enum ftenum ftype); +WS_DLL_PUBLIC gboolean ftype_can_contains(enum ftenum ftype); +WS_DLL_PUBLIC gboolean ftype_can_matches(enum ftenum ftype); @@ -257,7 +269,7 @@ fvalue_init(fvalue_t *fv, ftenum_t ftype); /* Free all memory used by an fvalue_t. With MSVC and a * libwireshark.dll, we need a special declaration. */ -WS_VAR_IMPORT struct ws_memory_slab fvalue_t_slab; +WS_DLL_PUBLIC struct ws_memory_slab fvalue_t_slab; #define FVALUE_CLEANUP(fv) \ @@ -275,7 +287,7 @@ WS_VAR_IMPORT struct ws_memory_slab fvalue_t_slab; sl_free(&fvalue_t_slab, fv); \ } - +WS_DLL_PUBLIC fvalue_t* fvalue_from_unparsed(ftenum_t ftype, char *s, gboolean allow_partial_value, LogFunc logfunc); @@ -288,6 +300,7 @@ fvalue_from_string(ftenum_t ftype, char *s, LogFunc logfunc); * Returns -1 if the string cannot be represented in the given rtype. * * The length DOES NOT include the terminating NUL. */ +WS_DLL_PUBLIC int fvalue_string_repr_len(fvalue_t *fv, ftrepr_t rtype); @@ -301,7 +314,7 @@ fvalue_string_repr_len(fvalue_t *fv, ftrepr_t rtype); * 'buf'. * * Returns NULL if the string cannot be represented in the given rtype.*/ -extern char * +WS_DLL_PUBLIC char * fvalue_to_string_repr(fvalue_t *fv, ftrepr_t rtype, char *buf); ftype_t* @@ -325,19 +338,21 @@ fvalue_set_integer64(fvalue_t *fv, guint64 value); void fvalue_set_floating(fvalue_t *fv, gdouble value); +WS_DLL_PUBLIC gpointer fvalue_get(fvalue_t *fv); -extern guint32 +WS_DLL_PUBLIC guint32 fvalue_get_uinteger(fvalue_t *fv); -extern gint32 +WS_DLL_PUBLIC gint32 fvalue_get_sinteger(fvalue_t *fv); +WS_DLL_PUBLIC guint64 fvalue_get_integer64(fvalue_t *fv); -extern double +WS_DLL_PUBLIC double fvalue_get_floating(fvalue_t *fv); gboolean |