aboutsummaryrefslogtreecommitdiffstats
path: root/epan/column-utils.h
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2001-10-31 07:47:27 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2001-10-31 07:47:27 +0000
commitbadacf808dbcbc9cff487469c2b814833800dcdf (patch)
tree023bcd46af188932f8ffdee562cf0bf5d6d3baba /epan/column-utils.h
parent80ca5a4d768d9f2f2d45ab5930fa9f628a72ee4b (diff)
Put "extern" in front of a pile of function declarations.
It makes no difference if they really are function declarations; however, in plugins, when building on OSes that don't let dynamically-loaded modules access functions in the main program (e.g., Windows), when compiling a plugin, <plugin_api.h> defines the names of those functions as (*pointer_name), so they turn into declarations of pointer variables pointing to the functions in question, and, on platforms with a def/ref model in the linker, if a plugin has more than one source file that gets linked into the plugin, the linker may get upset at two definitions of the same variable. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4114 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/column-utils.h')
-rw-r--r--epan/column-utils.h32
1 files changed, 15 insertions, 17 deletions
diff --git a/epan/column-utils.h b/epan/column-utils.h
index 0a5f8c1286..cafe5622e1 100644
--- a/epan/column-utils.h
+++ b/epan/column-utils.h
@@ -1,12 +1,11 @@
/* column-utils.h
* Definitions for column utility structures and routines
*
- * $Id: column-utils.h,v 1.2 2001/07/22 10:25:49 guy Exp $
+ * $Id: column-utils.h,v 1.3 2001/10/31 07:47:26 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -23,7 +22,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-
#ifndef __COLUMN_UTILS_H__
#define __COLUMN_UTILS_H__
@@ -37,27 +35,27 @@
/* Allocate all the data structures for constructing column data, given
the number of columns. */
-void col_init(column_info *, gint);
+extern void col_init(column_info *, gint);
/* Utility routines used by packet*.c */
-void col_set_writable(frame_data *fd, gboolean writable);
-gint check_col(frame_data *, gint);
-void col_clear(frame_data *, gint);
-void col_set_str(frame_data *, gint, gchar *);
+extern void col_set_writable(frame_data *fd, gboolean writable);
+extern gint check_col(frame_data *, gint);
+extern void col_clear(frame_data *, gint);
+extern void col_set_str(frame_data *, gint, gchar *);
#if __GNUC__ >= 2
-void col_add_fstr(frame_data *, gint, gchar *, ...)
+extern void col_add_fstr(frame_data *, gint, gchar *, ...)
__attribute__((format (printf, 3, 4)));
-void col_append_fstr(frame_data *, gint, gchar *, ...)
+extern void col_append_fstr(frame_data *, gint, gchar *, ...)
__attribute__((format (printf, 3, 4)));
#else
-void col_add_fstr(frame_data *, gint, gchar *, ...);
-void col_append_fstr(frame_data *, gint, gchar *, ...);
+extern void col_add_fstr(frame_data *, gint, gchar *, ...);
+extern void col_append_fstr(frame_data *, gint, gchar *, ...);
#endif
-void col_add_str(frame_data *, gint, const gchar *);
-void col_append_str(frame_data *, gint, gchar *);
-void col_set_cls_time(frame_data *, int);
-void fill_in_columns(frame_data *);
+extern void col_add_str(frame_data *, gint, const gchar *);
+extern void col_append_str(frame_data *, gint, gchar *);
+extern void col_set_cls_time(frame_data *, int);
+extern void fill_in_columns(frame_data *);
#endif /* __COLUMN_UTILS_H__ */