1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351
| diff -rNu stardict-3.0.1.orig/src/gconf_file.cpp stardict-3.0.1.modified/src/gconf_file.cpp
@@ -22,6 +22,8 @@ # include "config.h" #endif +#include <memory> + #include <glib/gi18n.h> #include "gconf_file.hpp" diff -rNu stardict-3.0.1.orig/src/inifile.cpp stardict-3.0.1.modified/src/inifile.cpp
@@ -25,6 +25,7 @@ #include <vector> #include <cerrno> #include <cstring> +#include <cstdlib> #include <cstdio> #include <glib/gi18n.h> #include <glib/gstdio.h> diff -rNu stardict-3.0.1.orig/src/lib/common.cpp stardict-3.0.1.modified/src/lib/common.cpp
@@ -26,6 +26,10 @@ #include "common.hpp" +//Added by hustsystem@gmail.com +#include <cstring> +#include <cstdlib> + static void parse_description(const char *p, long len, std::string &description) { description.clear(); diff -rNu stardict-3.0.1.orig/src/lib/data.cpp stardict-3.0.1.modified/src/lib/data.cpp
@@ -27,6 +27,9 @@ #include "data.hpp" #include "getuint32.h" +//Added by hustsystem@gmail.com +#include <cstring> +#include <cstdio> DictBase::DictBase() { diff -rNu stardict-3.0.1.orig/src/lib/http_client.cpp stardict-3.0.1.modified/src/lib/http_client.cpp
@@ -5,6 +5,9 @@ #include "http_client.h" #include "sockets.hpp" +//Added by hustsystem@gmail.com +#include <cstring> + sigc::signal<void, HttpClient *, const char *> HttpClient::on_error_; sigc::signal<void, HttpClient *> HttpClient::on_response_; diff -rNu stardict-3.0.1.orig/src/lib/pluginmanager.cpp stardict-3.0.1.modified/src/lib/pluginmanager.cpp
@@ -2,6 +2,9 @@ #include "file.hpp" #include <string> +//Added by hustsystem@gmail.com +#include <cstring> + StarDictPluginBaseObject::StarDictPluginBaseObject(const char *filename, GModule *module_, plugin_configure_func_t configure_func_): plugin_filename(filename), module(module_), configure_func(configure_func_) { diff -rNu stardict-3.0.1.orig/src/lib/stardict_client.cpp stardict-3.0.1.modified/src/lib/stardict_client.cpp
@@ -31,6 +31,10 @@ #include "stardict_client.hpp" +//Added by hustsystem@gmail.com +#include <cstdlib> +#include <cstdio> + #define PROTOCOL_VERSION "0.3" #define CODE_HELLO 220 /* text msg-id */ diff -rNu stardict-3.0.1.orig/src/lib/treedict.cpp stardict-3.0.1.modified/src/lib/treedict.cpp
@@ -30,6 +30,9 @@ #include "treedict.hpp" +//Added by hustsystem@gmail.com +#include <cstring> + GtkTreeStore *TreeDict::model=NULL; TreeDict::TreeDict() diff -rNu stardict-3.0.1.orig/src/pangoview.cpp stardict-3.0.1.modified/src/pangoview.cpp
@@ -22,6 +22,8 @@ # include "config.h" #endif +#include <cstring> + #include "gtktextviewpango.h" #include "utils.h" #include "skin.h"//for SkinCursor definition diff -rNu stardict-3.0.1.orig/src/prefsdlg.cpp stardict-3.0.1.modified/src/prefsdlg.cpp
@@ -21,6 +21,8 @@ # include "config.h" #endif +#include <cstdlib> + #include <glib/gi18n.h> #include <glib/gstdio.h> diff -rNu stardict-3.0.1.orig/src/readword.cpp stardict-3.0.1.modified/src/readword.cpp
@@ -3,6 +3,7 @@ #endif #include <cstring> +#include <cstdlib> #include <string> #include <glib/gi18n.h> diff -rNu stardict-3.0.1.orig/src/sigc++/signal.h stardict-3.0.1.modified/src/sigc++/signal.h
@@ -18,7 +18,7 @@ //Compilers, such as older versions of SUN Forte C++, that do not allow this also often //do not allow a typedef to have the same name as a class in the typedef's definition. //For Sun Forte CC 5.7 (SUN Workshop 10), comment this out to fix the build. - #define SIGC_TYPEDEF_REDEFINE_ALLOWED 1 +// #define SIGC_TYPEDEF_REDEFINE_ALLOWED 1 #endif namespace sigc { diff -rNu stardict-3.0.1.orig/src/utils.cpp stardict-3.0.1.modified/src/utils.cpp
@@ -22,6 +22,8 @@ # include "config.h" #endif +#include <cstring> + #include <glib.h> #include <glib/gi18n.h> #include <cstdlib> diff -rNu stardict-3.0.1.orig/src/x11_iskeyspressed.hpp stardict-3.0.1.modified/src/x11_iskeyspressed.hpp
@@ -1,6 +1,8 @@ #ifndef _X11_ISKEYSPRESSED_HPP_ #define _X11_ISKEYSPRESSED_HPP_ +#include <memory> + #include <gdk/gdkx.h> #include <X11/keysym.h> #include <gtk/gtk.h> diff -rNu stardict-3.0.1.orig/stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp stardict-3.0.1.modified/stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp
@@ -1,6 +1,6 @@ #include "stardict_dictdotcn.h" #include <glib/gi18n.h> -#include <string> +#include <cstring> #include <list> #ifdef _WIN32 diff -rNu stardict-3.0.1.orig/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp stardict-3.0.1.modified/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp
@@ -1,4 +1,5 @@ #include "stardict_espeak.h" +#include <cstring> #include <espeak/speak_lib.h> #include <glib/gi18n.h> diff -rNu stardict-3.0.1.orig/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp stardict-3.0.1.modified/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp
@@ -1,7 +1,8 @@ #include "stardict_gucharmap.h" #include <glib/gi18n.h> #include <gucharmap/gucharmap.h> -#include <string> +#include <cstring> +#include <cstdlib> static char *build_dictdata(char type, const char *definition) { diff -rNu stardict-3.0.1.orig/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp stardict-3.0.1.modified/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp
@@ -1,4 +1,6 @@ #include "stardict_html_parsedata.h" +#include <cstring> +#include <cstdlib> #include <glib/gi18n.h> #ifdef _WIN32 diff -rNu stardict-3.0.1.orig/stardict-plugins/stardict-man-plugin/stardict_man.cpp stardict-3.0.1.modified/stardict-plugins/stardict-man-plugin/stardict_man.cpp
@@ -1,6 +1,6 @@ #include "stardict_man.h" #include <glib/gi18n.h> -#include <string> +#include <cstring> static const StarDictPluginSystemInfo *plugin_info = NULL; static bool need_prefix; diff -rNu stardict-3.0.1.orig/stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp stardict-3.0.1.modified/stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp
@@ -1,4 +1,5 @@ #include "stardict_powerword_parsedata.h" +#include <cstring> #include <glib/gi18n.h> #ifdef _WIN32 diff -rNu stardict-3.0.1.orig/stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp stardict-3.0.1.modified/stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp
@@ -1,7 +1,8 @@ #include "stardict_qqwry.h" #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <string> +#include <cstring> +#include <cstdlib> #ifdef _WIN32 #include <windows.h> diff -rNu stardict-3.0.1.orig/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp stardict-3.0.1.modified/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp
@@ -1,4 +1,5 @@ #include "stardict_spell.h" +#include <cstring> #include <glib.h> #include <glib/gi18n.h> #include <enchant.h> diff -rNu stardict-3.0.1.orig/stardict-plugins/stardict-update-info-plugin/stardict_update_info.cpp stardict-3.0.1.modified/stardict-plugins/stardict-update-info-plugin/stardict_update_info.cpp
@@ -1,6 +1,9 @@ #include "stardict_update_info.h" #include <glib/gi18n.h> +//Added by hustsystem@gmail.com +#include <cstdlib> + #ifdef _WIN32 #include <windows.h> #endif diff -rNu stardict-3.0.1.orig/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp stardict-3.0.1.modified/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp
@@ -1,5 +1,6 @@ #include "stardict_wiki2xml.h" #include "WIKI2XML.h" +#include <cstring> #include <glib.h> std::string wiki2xml(std::string &str) diff -rNu stardict-3.0.1.orig/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp stardict-3.0.1.modified/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp
@@ -1,5 +1,6 @@ #include "stardict_wiki_parsedata.h" #include "stardict_wiki2xml.h" +#include <cstring> #include <glib/gi18n.h> #ifdef _WIN32 diff -rNu stardict-3.0.1.orig/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp stardict-3.0.1.modified/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp
@@ -1,4 +1,5 @@ #include "court_widget.h" +#include <cstring> #include <math.h> #include <list> diff -rNu stardict-3.0.1.orig/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp stardict-3.0.1.modified/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp
@@ -1,5 +1,6 @@ #include "stardict_wordnet.h" #include "court_widget.h" +#include <cstring> #include <glib/gi18n.h> #ifdef _WIN32 diff -rNu stardict-3.0.1.orig/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp stardict-3.0.1.modified/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp
@@ -1,4 +1,5 @@ #include "stardict_wordnet_parsedata.h" +#include <cstring> #include <glib/gi18n.h> #ifdef _WIN32 diff -rNu stardict-3.0.1.orig/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp stardict-3.0.1.modified/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp
@@ -1,4 +1,5 @@ #include "stardict_xdxf_parsedata.h" +#include <cstring> #include <glib/gi18n.h> #ifdef _WIN32 diff -rNu stardict-3.0.1.orig/tests/t_config_file.cpp stardict-3.0.1.modified/tests/t_config_file.cpp
@@ -8,6 +8,7 @@ #include <cstring> #include <iterator> #include <iostream> +#include <memory> #include <gtk/gtk.h> #include "config_file.hpp" diff -rNu stardict-3.0.1.orig/tests/t_xml.cpp stardict-3.0.1.modified/tests/t_xml.cpp
@@ -5,6 +5,7 @@ #include <glib.h> #include <cstdlib> #include <string> +#include <cstring> static void xml_decode(const char *str, std::string& decoded)
|