From beroset:

 remove C++ incompatibilities
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10404

Note: The following parts of the patch had been previously done:
 asn1/snmp/packet-snmp-template.c
 epan/dissectors/packet-snmp.c
 epan/dissectors/packet-x11.c

Also; hostlist_table.c: code under '#ifdef HAVE_GEOIP'
 didn't compile and needed a few additional patches.


svn path=/trunk/; revision=48447

1 files changed, 69 insertions, 67 deletions

diff --git a/ui/gtk/stock_icons.c b/ui/gtk/stock_icons.c
index 691af12483..7a95775875 100644
--- a/ui/gtk/stock_icons.c
+++ b/ui/gtk/stock_icons.c
@@ -74,6 +74,8 @@
 #include "../../image/toolbar/telephone_16.xpm"
 #include "../../image/toolbar/analyze_24.xpm"
 
+#define NO_MOD (GdkModifierType)0
+
 typedef struct stock_pixmap_tag{
     const char *    name;
     const char **   xpm_data;
@@ -95,75 +97,75 @@ void stock_icons_init(void) {
 
     /* register non-standard pixmaps with the gtk-stock engine */
     static const GtkStockItem stock_items[] = {
-        { (char *)WIRESHARK_STOCK_CAPTURE_INTERFACES,    (char *)"_Interfaces",    0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_CAPTURE_OPTIONS,       (char *)"_Options",       0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_CAPTURE_START,         (char *)"_Start",         0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_CAPTURE_STOP,          (char *)"S_top",          0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_CAPTURE_RESTART,       (char *)"_Restart",       0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_CAPTURE_FILTER,        (char *)"_Capture Filter",   0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_CAPTURE_FILTER_ENTRY,  (char *)"_Capture Filter:",  0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_CAPTURE_DETAILS,       (char *)"_Details",       0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_CAPTURE_INTERFACES,    (char *)"_Interfaces",    NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_CAPTURE_OPTIONS,       (char *)"_Options",       NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_CAPTURE_START,         (char *)"_Start",         NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_CAPTURE_STOP,          (char *)"S_top",          NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_CAPTURE_RESTART,       (char *)"_Restart",       NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_CAPTURE_FILTER,        (char *)"_Capture Filter",   NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_CAPTURE_FILTER_ENTRY,  (char *)"_Capture Filter:",  NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_CAPTURE_DETAILS,       (char *)"_Details",       NO_MOD, 0, NULL },
 #ifdef HAVE_GEOIP
-        { (char *)WIRESHARK_STOCK_MAP,                   (char *)"Map",                   0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_MAP,                   (char *)"Map",                   NO_MOD, 0, NULL },
 #endif
-        { (char *)WIRESHARK_STOCK_GRAPH_A_B,             (char *)"Graph A->B",            0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_GRAPH_B_A,             (char *)"Graph B->A",            0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_FOLLOW_STREAM,         (char *)"Follow Stream",         0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_DISPLAY_FILTER,        (char *)"Display _Filter",       0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY,  (char *)"F_ilter:",  0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_BROWSE,                (char *)"_Browse...",                0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_CREATE_STAT,           (char *)"Create _Stat",           0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_EXPORT,                (char *)"_Export...",                0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_IMPORT,                (char *)"_Import...",                0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_EDIT,                  (char *)"_Edit...",                  0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_ADD_EXPRESSION,        (char *)"E_xpression..." ,        0, 0, NULL }, /* plus sign coming from icon */
-        { (char *)WIRESHARK_STOCK_CLEAR_EXPRESSION,      (char *)"Clea_r" ,                   0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_APPLY_EXPRESSION,      (char *)"App_ly" ,                   0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_SAVE_ALL,              (char *)"Save A_ll",             0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_DONT_SAVE,             (char *)"Continue _without Saving",             0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_QUIT_DONT_SAVE,        (char *)"Quit _without Saving",             0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_STOP_DONT_SAVE,        (char *)"Stop and Continue _without Saving",             0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_STOP_QUIT_DONT_SAVE,   (char *)"Stop and Quit _without Saving",             0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_STOP_SAVE,             (char *)"Stop and Save",             0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_ABOUT,                 (char *)"_About",                 0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_COLORIZE,              (char *)"_Colorize",              0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_AUTOSCROLL,            (char *)"_Auto Scroll",            0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_RESIZE_COLUMNS,        (char *)"Resize Columns",        0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_TIME,                  (char *)"Time",                  0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_INTERNET,              (char *)"Internet",              0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_WEB_SUPPORT,           (char *)"Web Support",           0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_WIKI,                  (char *)"Wiki",                  0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_CONVERSATIONS,         (char *)"Conversations",         0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_ENDPOINTS,             (char *)"Endpoints",             0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_EXPERT_INFO,           (char *)"Expert Info",           0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_GRAPHS,                (char *)"Graphs",                0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_FLOW_GRAPH,            (char *)"Flow Graph",            0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_TELEPHONY,             (char *)"Telephony",             0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_DECODE_AS,             (char *)"Decode As",             0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_CHECKBOX,              (char *)"Checkbox",              0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_FILE_SET_LIST,         (char *)"List Files",         0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_FILE_SET_NEXT,         (char *)"Next File",         0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_FILE_SET_PREVIOUS,     (char *)"Previous File",     0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_FILTER_OUT_STREAM,     (char *)"Filter Out This Stream",     0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_ENABLE,                (char *)"Enable",                0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_DISABLE,               (char *)"Disable",               0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_COLOR1,                (char *)"Color 1",                0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_COLOR2,                (char *)"Color 2",                0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_COLOR3,                (char *)"Color 3",                0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_COLOR4,                (char *)"Color 4",                0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_COLOR5,                (char *)"Color 5",                0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_COLOR6,                (char *)"Color 6",                0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_COLOR7,                (char *)"Color 7",                0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_COLOR8,                (char *)"Color 8",                0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_COLOR9,                (char *)"Color 9",                0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_COLOR0,                (char *)"Color 10",               0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_DECODE,                (char *)"Decode",                 0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_AUDIO_PLAYER,          (char *)"Player",                 0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_VOIP_FLOW,             (char *)"Flow",                   0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_TELEPHONE,             (char *)"Telephone",              0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_PREPARE_FILTER,        (char *)"Prepare Filter",         0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_ANALYZE,               (char *)"Analyze",                0, 0, NULL },
-        { (char *)WIRESHARK_STOCK_SAVE,                  (char *)"Save",                   0, 0, NULL }
+        { (char *)WIRESHARK_STOCK_GRAPH_A_B,             (char *)"Graph A->B",            NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_GRAPH_B_A,             (char *)"Graph B->A",            NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_FOLLOW_STREAM,         (char *)"Follow Stream",         NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_DISPLAY_FILTER,        (char *)"Display _Filter",       NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY,  (char *)"F_ilter:",  NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_BROWSE,                (char *)"_Browse...",                NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_CREATE_STAT,           (char *)"Create _Stat",           NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_EXPORT,                (char *)"_Export...",                NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_IMPORT,                (char *)"_Import...",                NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_EDIT,                  (char *)"_Edit...",                  NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_ADD_EXPRESSION,        (char *)"E_xpression..." ,        NO_MOD, 0, NULL }, /* plus sign coming from icon */
+        { (char *)WIRESHARK_STOCK_CLEAR_EXPRESSION,      (char *)"Clea_r" ,                   NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_APPLY_EXPRESSION,      (char *)"App_ly" ,                   NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_SAVE_ALL,              (char *)"Save A_ll",             NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_DONT_SAVE,             (char *)"Continue _without Saving",             NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_QUIT_DONT_SAVE,        (char *)"Quit _without Saving",             NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_STOP_DONT_SAVE,        (char *)"Stop and Continue _without Saving",             NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_STOP_QUIT_DONT_SAVE,   (char *)"Stop and Quit _without Saving",             NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_STOP_SAVE,             (char *)"Stop and Save",             NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_ABOUT,                 (char *)"_About",                 NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_COLORIZE,              (char *)"_Colorize",              NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_AUTOSCROLL,            (char *)"_Auto Scroll",            NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_RESIZE_COLUMNS,        (char *)"Resize Columns",        NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_TIME,                  (char *)"Time",                  NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_INTERNET,              (char *)"Internet",              NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_WEB_SUPPORT,           (char *)"Web Support",           NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_WIKI,                  (char *)"Wiki",                  NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_CONVERSATIONS,         (char *)"Conversations",         NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_ENDPOINTS,             (char *)"Endpoints",             NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_EXPERT_INFO,           (char *)"Expert Info",           NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_GRAPHS,                (char *)"Graphs",                NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_FLOW_GRAPH,            (char *)"Flow Graph",            NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_TELEPHONY,             (char *)"Telephony",             NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_DECODE_AS,             (char *)"Decode As",             NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_CHECKBOX,              (char *)"Checkbox",              NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_FILE_SET_LIST,         (char *)"List Files",         NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_FILE_SET_NEXT,         (char *)"Next File",         NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_FILE_SET_PREVIOUS,     (char *)"Previous File",     NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_FILTER_OUT_STREAM,     (char *)"Filter Out This Stream",     NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_ENABLE,                (char *)"Enable",                NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_DISABLE,               (char *)"Disable",               NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_COLOR1,                (char *)"Color 1",                NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_COLOR2,                (char *)"Color 2",                NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_COLOR3,                (char *)"Color 3",                NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_COLOR4,                (char *)"Color 4",                NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_COLOR5,                (char *)"Color 5",                NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_COLOR6,                (char *)"Color 6",                NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_COLOR7,                (char *)"Color 7",                NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_COLOR8,                (char *)"Color 8",                NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_COLOR9,                (char *)"Color 9",                NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_COLOR0,                (char *)"Color 10",               NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_DECODE,                (char *)"Decode",                 NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_AUDIO_PLAYER,          (char *)"Player",                 NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_VOIP_FLOW,             (char *)"Flow",                   NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_TELEPHONE,             (char *)"Telephone",              NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_PREPARE_FILTER,        (char *)"Prepare Filter",         NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_ANALYZE,               (char *)"Analyze",                NO_MOD, 0, NULL },
+        { (char *)WIRESHARK_STOCK_SAVE,                  (char *)"Save",                   NO_MOD, 0, NULL }
     };
 
     static const stock_pixmap_t pixmaps[] = {