You can't return from inside a TRY/CATCH/ENDTRY block (see

[metze/wireshark/wip.git] / color_filters.h

diff --git a/color_filters.h b/color_filters.h
index 709f61b3b4c045767291ea6b65d69761fb63233c..5ada0fd10dbed3cfdf10775458a33cf437cd3b7e 100644 (file)
--- a/color_filters.h
+++ b/color_filters.h
@@ -19,12 +19,16 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #ifndef  __COLOR_FILTERS_H__
 #define  __COLOR_FILTERS_H__
 
-#define TEMP_COLOR_PREFIX       "___tmp_color_filter___"
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#define CONVERSATION_COLOR_PREFIX       "___conversation_color_filter___"
 /** @file
  *  Color filters.
  */
@@ -190,6 +194,8 @@ void color_filter_delete(color_filter_t *colorf);
  */
 void color_filter_list_delete(GSList **cfl);
 
-
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
 
 #endif