Revert SVN #32360 until Windows compilation errors corrected.

svn path=/trunk/; revision=32361

1 files changed, 21 insertions, 21 deletions

diff --git a/epan/column-utils.h b/epan/column-utils.h
index a9f76ece35..438374b6b8 100644
--- a/epan/column-utils.h
+++ b/epan/column-utils.h
@@ -51,7 +51,7 @@ extern "C" {
  *
  * Internal, don't use this in dissectors!
  */
-extern void	col_setup(column_info *cinfo, const gint num_cols);
+extern void	col_setup(column_info *cinfo, gint num_cols);
 
 /** Initialize the data structures for constructing column data.
  *
@@ -63,19 +63,19 @@ extern void	col_init(column_info *cinfo);
  *
  * Internal, don't use this in dissectors!
  */
-extern void	col_set_fmt_time(const frame_data *fd, column_info *cinfo, const gint fmt, const gint col);
+extern void	col_set_fmt_time(frame_data *fd, column_info *cinfo, gint fmt, gint col);
 
 /** Fill in all columns of the given packet which are based on values from frame_data.
  *
  * Internal, don't use this in dissectors!
  */
-extern void col_fill_in_frame_data(const frame_data *fd, column_info *cinfo, const gint col, gboolean const fill_col_exprs);
+extern void col_fill_in_frame_data(frame_data *fd, column_info *cinfo, gint col, gboolean fill_col_exprs);
 
 /** Fill in all columns of the given packet.
  *
  * Internal, don't use this in dissectors!
  */
-extern void	col_fill_in(packet_info *pinfo, const gboolean fill_col_exprs, const gboolean fill_fd_colums);
+extern void	col_fill_in(packet_info *pinfo, gboolean fill_col_exprs, gboolean fill_fd_colums);
 
 /* Utility routines used by packet*.c */
 
@@ -91,14 +91,14 @@ extern gboolean	col_get_writable(column_info *cinfo);
  * @param cinfo the current packet row
  * @param writable TRUE if it's writable, FALSE if not
  */
-extern void	col_set_writable(column_info *cinfo, const gboolean writable);
+extern void	col_set_writable(column_info *cinfo, gboolean writable);
 
 /** Check if the given column be filled with data.
  *
  * @param cinfo the current packet row
  * @param col the column to use, e.g. COL_INFO
  */
-extern gint	check_col(column_info *cinfo, const gint col);
+extern gint	check_col(column_info *cinfo, gint col);
 
 /** Sets a fence for the current column content,
  * so this content won't be affected by further col_... function calls.
@@ -109,14 +109,14 @@ extern gint	check_col(column_info *cinfo, const gint col);
  * @param cinfo the current packet row
  * @param col the column to use, e.g. COL_INFO
  */
-extern void	col_set_fence(column_info *cinfo, const gint col);
+extern void	col_set_fence(column_info *cinfo, gint col);
 
 /** Clears the text of a column element.
  *
  * @param cinfo the current packet row
  * @param col the column to use, e.g. COL_INFO
  */
-extern void	col_clear(column_info *cinfo, const gint col);
+extern void	col_clear(column_info *cinfo, gint col);
 
 /** Set (replace) the text of a column element, the text won't be copied.
  *
@@ -126,7 +126,7 @@ extern void	col_clear(column_info *cinfo, const gint col);
  * @param col the column to use, e.g. COL_INFO
  * @param str the string to set
  */
-extern void	col_set_str(column_info *cinfo, const gint col, const gchar * str);
+extern void	col_set_str(column_info *cinfo, gint col, const gchar * str);
 
 /** Add (replace) the text of a column element, the text will be copied.
  *
@@ -134,7 +134,7 @@ extern void	col_set_str(column_info *cinfo, const gint col, const gchar * str);
  * @param col the column to use, e.g. COL_INFO
  * @param str the string to add
  */
-extern void	col_add_str(column_info *cinfo, const gint col, const gchar *str);
+extern void	col_add_str(column_info *cinfo, gint col, const gchar *str);
 
 /** Add (replace) the text of a column element, the text will be formatted and copied.
  *
@@ -145,7 +145,7 @@ extern void	col_add_str(column_info *cinfo, const gint col, const gchar *str);
  * @param format the format string
  * @param ... the variable number of parameters
  */
-extern void	col_add_fstr(column_info *cinfo, const gint col, const gchar *format, ...)
+extern void	col_add_fstr(column_info *cinfo, gint col, const gchar *format, ...)
     G_GNUC_PRINTF(3, 4);
 
 /* For internal Wireshark use only.  Not to be called from dissectors. */
@@ -156,8 +156,8 @@ void col_custom_prime_edt(epan_dissect_t *edt, column_info *cinfo);
 
 /* For internal Wireshark use only.  Not to be called from dissectors. */
 gboolean have_custom_cols(column_info *cinfo);
-gboolean col_has_time_fmt(column_info *cinfo, const gint col);
-gboolean col_based_on_frame_data(column_info *cinfo, const gint col);
+gboolean col_has_time_fmt(column_info *cinfo, gint col);
+gboolean col_based_on_frame_data(column_info *cinfo, gint col);
 
 /** Append the given text to a column element, the text will be copied.
  *
@@ -165,7 +165,7 @@ gboolean col_based_on_frame_data(column_info *cinfo, const gint col);
  * @param col the column to use, e.g. COL_INFO
  * @param str the string to append
  */
-extern void	col_append_str(column_info *cinfo, const gint col, const gchar *str);
+extern void	col_append_str(column_info *cinfo, gint col, const gchar *str);
 
 /** Append the given text to a column element, the text will be formatted and copied.
  *
@@ -176,7 +176,7 @@ extern void	col_append_str(column_info *cinfo, const gint col, const gchar *str)
  * @param format the format string
  * @param ... the variable number of parameters
  */
-extern void	col_append_fstr(column_info *cinfo, const gint col, const gchar *format, ...)
+extern void	col_append_fstr(column_info *cinfo, gint col, const gchar *format, ...)
     G_GNUC_PRINTF(3, 4);
 
 /** Prepend the given text to a column element, the text will be formatted and copied.
@@ -186,7 +186,7 @@ extern void	col_append_fstr(column_info *cinfo, const gint col, const gchar *for
  * @param format the format string
  * @param ... the variable number of parameters
  */
-extern void	col_prepend_fstr(column_info *cinfo, const gint col, const gchar *format, ...)
+extern void	col_prepend_fstr(column_info *cinfo, gint col, const gchar *format, ...)
     G_GNUC_PRINTF(3, 4);
 
 /**Prepend the given text to a column element, the text will be formatted and copied.
@@ -197,7 +197,7 @@ extern void	col_prepend_fstr(column_info *cinfo, const gint col, const gchar *fo
  * there is already a fence created. This function will create a fence in case
  * it does not yet exist.
  */
-extern void	col_prepend_fence_fstr(column_info *cinfo, const gint col, const gchar *format, ...)
+extern void	col_prepend_fence_fstr(column_info *cinfo, gint col, const gchar *format, ...)
     G_GNUC_PRINTF(3, 4);
 
 /** Append the given text (prepended by a separator) to a column element.
@@ -209,7 +209,7 @@ extern void	col_prepend_fence_fstr(column_info *cinfo, const gint col, const gch
  * @param sep the separator string or NULL for default: ", "
  * @param str the string to append
  */
-extern void	col_append_sep_str(column_info *cinfo, const gint col, const gchar *sep,
+extern void	col_append_sep_str(column_info *cinfo, gint col, const gchar *sep,
 		const gchar *str);
 
 /** Append the given text (prepended by a separator) to a column element.
@@ -222,7 +222,7 @@ extern void	col_append_sep_str(column_info *cinfo, const gint col, const gchar *
  * @param format the format string
  * @param ... the variable number of parameters
  */
-extern void	col_append_sep_fstr(column_info *cinfo, const gint col, const gchar *sep,
+extern void	col_append_sep_fstr(column_info *cinfo, gint col, const gchar *sep,
 		const gchar *format, ...)
     G_GNUC_PRINTF(4, 5);
 
@@ -237,8 +237,8 @@ extern void	col_append_sep_fstr(column_info *cinfo, const gint col, const gchar
  * @param fieldname	the fieldname to use for creating a filter (when
  *			  applying/preparing/copying as filter)
  */
-extern void 	col_set_time(column_info *cinfo, const int col,
-			const nstime_t *ts, char *fieldname);
+extern void 	col_set_time(column_info *cinfo, int col,
+			nstime_t *ts, char *fieldname);
 
 #ifdef __cplusplus
 }