psychosynth/gcc43.patch

   1 diff -Naur psychosynth-0.1.1.orig/libpsynth/common/ArgParser.cpp psychosynth-0.1.1/libpsynth/common/ArgParser.cpp
   2 --- psychosynth-0.1.1.orig/libpsynth/common/ArgParser.cpp       2008-02-26 02:06:51.000000000 +0800
   3 +++ psychosynth-0.1.1/libpsynth/common/ArgParser.cpp    2008-06-04 22:32:03.957061137 +0800
   4 @@ -20,6 +20,8 @@
   5   *                                                                         *
   6   ***************************************************************************/
   7
   8 +#include <cstring>
   9 +#include <cstdlib>
  10  #include "common/ArgParser.h"
  11
  12  using namespace std;
  13 diff -Naur psychosynth-0.1.1.orig/libpsynth/common/FileFinder.cpp psychosynth-0.1.1/libpsynth/common/FileFinder.cpp
  14 --- psychosynth-0.1.1.orig/libpsynth/common/FileFinder.cpp      2008-04-03 01:27:47.000000000 +0800
  15 +++ psychosynth-0.1.1/libpsynth/common/FileFinder.cpp   2008-06-04 22:32:03.960394242 +0800
  16 @@ -20,6 +20,8 @@
  17   *                                                                         *
  18   ***************************************************************************/
  19
  20 +#include <cstring>
  21 +#include <cstdlib>
  22  #include "common/FileFinder.h"
  23  #include "common/Misc.h"
  24
  25 diff -Naur psychosynth-0.1.1.orig/libpsynth/common/FileManager.cpp psychosynth-0.1.1/libpsynth/common/FileManager.cpp
  26 --- psychosynth-0.1.1.orig/libpsynth/common/FileManager.cpp     2008-04-02 23:31:58.000000000 +0800
  27 +++ psychosynth-0.1.1/libpsynth/common/FileManager.cpp  2008-06-04 22:32:03.960394242 +0800
  28 @@ -20,6 +20,8 @@
  29   *                                                                         *
  30   ***************************************************************************/
  31
  32 +#include <cstring>
  33 +#include <cstdlib>
  34  #include "common/FileManager.h"
  35
  36  namespace psynth
  37 diff -Naur psychosynth-0.1.1.orig/libpsynth/common/Misc.cpp psychosynth-0.1.1/libpsynth/common/Misc.cpp
  38 --- psychosynth-0.1.1.orig/libpsynth/common/Misc.cpp    2008-04-02 01:45:47.000000000 +0800
  39 +++ psychosynth-0.1.1/libpsynth/common/Misc.cpp 2008-06-04 22:32:03.960394242 +0800
  40 @@ -20,6 +20,7 @@
  41   *                                                                         *
  42   ***************************************************************************/
  43
  44 +#include <cstring>
  45  #include <cmath>
  46  #include <cctype>
  47
  48 diff -Naur psychosynth-0.1.1.orig/libpsynth/net/OSCBroadcast.cpp psychosynth-0.1.1/libpsynth/net/OSCBroadcast.cpp
  49 --- psychosynth-0.1.1.orig/libpsynth/net/OSCBroadcast.cpp       2008-02-25 20:31:55.000000000 +0800
  50 +++ psychosynth-0.1.1/libpsynth/net/OSCBroadcast.cpp    2008-06-04 22:32:03.963728115 +0800
  51 @@ -20,6 +20,7 @@
  52   *                                                                         *
  53   ***************************************************************************/
  54
  55 +#include <cstring>
  56  #include <iostream>
  57
  58  #include "net/OSCBroadcast.h"
  59 diff -Naur psychosynth-0.1.1.orig/libpsynth/net/OSCClient.cpp psychosynth-0.1.1/libpsynth/net/OSCClient.cpp
  60 --- psychosynth-0.1.1.orig/libpsynth/net/OSCClient.cpp  2008-04-04 19:46:40.000000000 +0800
  61 +++ psychosynth-0.1.1/libpsynth/net/OSCClient.cpp       2008-06-04 22:32:03.963728115 +0800
  62 @@ -20,6 +20,7 @@
  63   *                                                                         *
  64   ***************************************************************************/
  65
  66 +#include <algorithm>
  67  #include "net/OSCClient.h"
  68  #include "net/OSCProtocol.h"
  69
  70 diff -Naur psychosynth-0.1.1.orig/libpsynth/net/OSCController.cpp psychosynth-0.1.1/libpsynth/net/OSCController.cpp
  71 --- psychosynth-0.1.1.orig/libpsynth/net/OSCController.cpp      2008-03-17 02:00:05.000000000 +0800
  72 +++ psychosynth-0.1.1/libpsynth/net/OSCController.cpp   2008-06-04 22:32:03.963728115 +0800
  73 @@ -20,6 +20,7 @@
  74   *                                                                         *
  75   ***************************************************************************/
  76
  77 +#include <algorithm>
  78  #include "net/OSCController.h"
  79  #include "net/OSCProtocol.h"
  80
  81 diff -Naur psychosynth-0.1.1.orig/libpsynth/net/OSCServer.cpp psychosynth-0.1.1/libpsynth/net/OSCServer.cpp
  82 --- psychosynth-0.1.1.orig/libpsynth/net/OSCServer.cpp  2008-04-04 19:46:52.000000000 +0800
  83 +++ psychosynth-0.1.1/libpsynth/net/OSCServer.cpp       2008-06-04 22:32:03.963728115 +0800
  84 @@ -20,6 +20,9 @@
  85   *                                                                         *
  86   ***************************************************************************/
  87
  88 +#include <cstring>
  89 +#include <algorithm>
  90 +#include <cstdio>
  91  #include "net/OSCServer.h"
  92  #include "net/OSCProtocol.h"
  93
  94 diff -Naur psychosynth-0.1.1.orig/libpsynth/object/Object.cpp psychosynth-0.1.1/libpsynth/object/Object.cpp
  95 --- psychosynth-0.1.1.orig/libpsynth/object/Object.cpp  2008-04-01 23:12:34.000000000 +0800
  96 +++ psychosynth-0.1.1/libpsynth/object/Object.cpp       2008-06-04 22:32:03.967061360 +0800
  97 @@ -20,6 +20,7 @@
  98   *                                                                         *
  99   ***************************************************************************/
 100
 101 +#include <algorithm>
 102  #include "common/Deleter.h"
 103  #include "object/Object.h"
 104
 105 diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectAudioMixer.cpp psychosynth-0.1.1/libpsynth/object/ObjectAudioMixer.cpp
 106 --- psychosynth-0.1.1.orig/libpsynth/object/ObjectAudioMixer.cpp        2008-03-31 07:59:13.000000000 +0800
 107 +++ psychosynth-0.1.1/libpsynth/object/ObjectAudioMixer.cpp     2008-06-04 22:32:03.967061360 +0800
 108 @@ -20,6 +20,7 @@
 109   *                                                                         *
 110   ***************************************************************************/
 111
 112 +#include <algorithm>
 113  #include "object/ObjectAudioMixer.h"
 114
 115  namespace psynth
 116 diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectAudioNoise.cpp psychosynth-0.1.1/libpsynth/object/ObjectAudioNoise.cpp
 117 --- psychosynth-0.1.1.orig/libpsynth/object/ObjectAudioNoise.cpp        2008-04-05 00:40:25.000000000 +0800
 118 +++ psychosynth-0.1.1/libpsynth/object/ObjectAudioNoise.cpp     2008-06-04 22:32:03.967061360 +0800
 119 @@ -20,6 +20,7 @@
 120   *                                                                         *
 121   ***************************************************************************/
 122
 123 +#include <algorithm>
 124  #include "object/ObjectAudioNoise.h"
 125
 126  using namespace std;
 127 diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectAudioOscillator.cpp psychosynth-0.1.1/libpsynth/object/ObjectAudioOscillator.cpp
 128 --- psychosynth-0.1.1.orig/libpsynth/object/ObjectAudioOscillator.cpp   2008-03-28 00:35:13.000000000 +0800
 129 +++ psychosynth-0.1.1/libpsynth/object/ObjectAudioOscillator.cpp        2008-06-04 22:32:03.967061360 +0800
 130 @@ -20,6 +20,7 @@
 131   *                                                                         *
 132   ***************************************************************************/
 133
 134 +#include <algorithm>
 135  #include "object/ObjectAudioOscillator.h"
 136
 137  using namespace std;
 138 diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectControlMixer.cpp psychosynth-0.1.1/libpsynth/object/ObjectControlMixer.cpp
 139 --- psychosynth-0.1.1.orig/libpsynth/object/ObjectControlMixer.cpp      2008-03-31 07:59:43.000000000 +0800
 140 +++ psychosynth-0.1.1/libpsynth/object/ObjectControlMixer.cpp   2008-06-04 22:32:03.967061360 +0800
 141 @@ -20,6 +20,7 @@
 142   *                                                                         *
 143   ***************************************************************************/
 144
 145 +#include <algorithm>
 146  #include "object/ObjectControlMixer.h"
 147
 148  namespace psynth
 149 diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectControlNoise.cpp psychosynth-0.1.1/libpsynth/object/ObjectControlNoise.cpp
 150 --- psychosynth-0.1.1.orig/libpsynth/object/ObjectControlNoise.cpp      2008-04-05 00:40:07.000000000 +0800
 151 +++ psychosynth-0.1.1/libpsynth/object/ObjectControlNoise.cpp   2008-06-04 22:32:03.967061360 +0800
 152 @@ -20,6 +20,7 @@
 153   *                                                                         *
 154   ***************************************************************************/
 155
 156 +#include <algorithm>
 157  #include "object/ObjectControlNoise.h"
 158
 159  using namespace std;
 160 diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectDelay.cpp psychosynth-0.1.1/libpsynth/object/ObjectDelay.cpp
 161 --- psychosynth-0.1.1.orig/libpsynth/object/ObjectDelay.cpp     2008-04-06 03:23:49.000000000 +0800
 162 +++ psychosynth-0.1.1/libpsynth/object/ObjectDelay.cpp  2008-06-04 22:32:03.967061360 +0800
 163 @@ -20,6 +20,7 @@
 164   *                                                                         *
 165   ***************************************************************************/
 166
 167 +#include <algorithm>
 168  #include "object/ObjectDelay.h"
 169  #include "object/KnownObjects.h"
 170
 171 diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectEcho.cpp psychosynth-0.1.1/libpsynth/object/ObjectEcho.cpp
 172 --- psychosynth-0.1.1.orig/libpsynth/object/ObjectEcho.cpp      2008-04-05 23:04:11.000000000 +0800
 173 +++ psychosynth-0.1.1/libpsynth/object/ObjectEcho.cpp   2008-06-04 22:32:03.967061360 +0800
 174 @@ -20,6 +20,7 @@
 175   *                                                                         *
 176   ***************************************************************************/
 177
 178 +#include <algorithm>
 179  #include "object/ObjectEcho.h"
 180  #include "object/KnownObjects.h"
 181
 182 diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectFactoryManager.cpp psychosynth-0.1.1/libpsynth/object/ObjectFactoryManager.cpp
 183 --- psychosynth-0.1.1.orig/libpsynth/object/ObjectFactoryManager.cpp    2008-03-17 04:03:36.000000000 +0800
 184 +++ psychosynth-0.1.1/libpsynth/object/ObjectFactoryManager.cpp 2008-06-04 22:32:03.967061360 +0800
 185 @@ -20,6 +20,7 @@
 186   *                                                                         *
 187   ***************************************************************************/
 188
 189 +#include <algorithm>
 190  #include "object/ObjectFactoryManager.h"
 191
 192  using namespace std;
 193 diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectFilter.cpp psychosynth-0.1.1/libpsynth/object/ObjectFilter.cpp
 194 --- psychosynth-0.1.1.orig/libpsynth/object/ObjectFilter.cpp    2008-03-22 08:54:05.000000000 +0800
 195 +++ psychosynth-0.1.1/libpsynth/object/ObjectFilter.cpp 2008-06-04 22:32:03.967061360 +0800
 196 @@ -20,6 +20,7 @@
 197   *                                                                         *
 198   ***************************************************************************/
 199
 200 +#include <algorithm>
 201  #include "object/ObjectFilter.h"
 202  #include "object/KnownObjects.h"
 203
 204 diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectLFO.cpp psychosynth-0.1.1/libpsynth/object/ObjectLFO.cpp
 205 --- psychosynth-0.1.1.orig/libpsynth/object/ObjectLFO.cpp       2008-03-28 00:35:35.000000000 +0800
 206 +++ psychosynth-0.1.1/libpsynth/object/ObjectLFO.cpp    2008-06-04 22:32:03.970394745 +0800
 207 @@ -20,6 +20,7 @@
 208   *                                                                         *
 209   ***************************************************************************/
 210
 211 +#include <algorithm>
 212  #include "object/ObjectLFO.h"
 213
 214  using namespace std;
 215 diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectMixer.cpp psychosynth-0.1.1/libpsynth/object/ObjectMixer.cpp
 216 --- psychosynth-0.1.1.orig/libpsynth/object/ObjectMixer.cpp     2008-04-06 23:50:23.000000000 +0800
 217 +++ psychosynth-0.1.1/libpsynth/object/ObjectMixer.cpp  2008-06-04 22:32:03.970394745 +0800
 218 @@ -20,6 +20,7 @@
 219   *                                                                         *
 220   ***************************************************************************/
 221
 222 +#include <algorithm>
 223  #include "object/KnownObjects.h"
 224  #include "object/ObjectMixer.h"
 225
 226 diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectNoise.cpp psychosynth-0.1.1/libpsynth/object/ObjectNoise.cpp
 227 --- psychosynth-0.1.1.orig/libpsynth/object/ObjectNoise.cpp     2008-04-05 01:45:13.000000000 +0800
 228 +++ psychosynth-0.1.1/libpsynth/object/ObjectNoise.cpp  2008-06-04 22:32:03.970394745 +0800
 229 @@ -20,6 +20,8 @@
 230   *                                                                         *
 231   ***************************************************************************/
 232
 233 +#include <algorithm>
 234 +#include <climits>
 235  #include "object/ObjectNoise.h"
 236
 237  namespace psynth
 238 diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectOscillator.cpp psychosynth-0.1.1/libpsynth/object/ObjectOscillator.cpp
 239 --- psychosynth-0.1.1.orig/libpsynth/object/ObjectOscillator.cpp        2008-04-03 16:35:12.000000000 +0800
 240 +++ psychosynth-0.1.1/libpsynth/object/ObjectOscillator.cpp     2008-06-04 22:32:03.970394745 +0800
 241 @@ -20,6 +20,7 @@
 242   *                                                                         *
 243   ***************************************************************************/
 244
 245 +#include <algorithm>
 246  #include <iostream>
 247
 248  #include "object/KnownObjects.h"
 249 diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectStepSeq.cpp psychosynth-0.1.1/libpsynth/object/ObjectStepSeq.cpp
 250 --- psychosynth-0.1.1.orig/libpsynth/object/ObjectStepSeq.cpp   2008-04-05 01:52:26.000000000 +0800
 251 +++ psychosynth-0.1.1/libpsynth/object/ObjectStepSeq.cpp        2008-06-04 22:32:03.970394745 +0800
 252 @@ -20,6 +20,7 @@
 253   *                                                                         *
 254   ***************************************************************************/
 255
 256 +#include <algorithm>
 257  #include "common/Misc.h"
 258  #include "object/KnownObjects.h"
 259  #include "object/EnvelopeMulti.h"
 260 diff -Naur psychosynth-0.1.1.orig/libpsynth/psynth/Director.cpp psychosynth-0.1.1/libpsynth/psynth/Director.cpp
 261 --- psychosynth-0.1.1.orig/libpsynth/psynth/Director.cpp        2008-04-05 23:06:35.000000000 +0800
 262 +++ psychosynth-0.1.1/libpsynth/psynth/Director.cpp     2008-06-04 22:32:03.973727640 +0800
 263 @@ -20,6 +20,8 @@
 264   *                                                                         *
 265   ***************************************************************************/
 266
 267 +#include <cstring>
 268 +#include <algorithm>
 269  #include "psynth/Director.h"
 270  #include "psynth/Defaults.h"
 271  #include "table/PatcherDynamic.h"
 272 diff -Naur psychosynth-0.1.1.orig/libpsynth/psynth/FileManagerDirector.cpp psychosynth-0.1.1/libpsynth/psynth/FileManagerDirector.cpp
 273 --- psychosynth-0.1.1.orig/libpsynth/psynth/FileManagerDirector.cpp     2008-04-03 01:38:21.000000000 +0800
 274 +++ psychosynth-0.1.1/libpsynth/psynth/FileManagerDirector.cpp  2008-06-04 22:32:03.973727640 +0800
 275 @@ -20,6 +20,8 @@
 276   *                                                                         *
 277   ***************************************************************************/
 278
 279 +#include <cstring>
 280 +#include <cstdlib>
 281  #include "version.h"
 282  #include "common/FileManager.h"
 283  #include "psynth/FileManagerDirector.h"
 284 diff -Naur psychosynth-0.1.1.orig/libpsynth/psynth/PsychosynthApp.cpp psychosynth-0.1.1/libpsynth/psynth/PsychosynthApp.cpp
 285 --- psychosynth-0.1.1.orig/libpsynth/psynth/PsychosynthApp.cpp  2008-04-04 07:06:35.000000000 +0800
 286 +++ psychosynth-0.1.1/libpsynth/psynth/PsychosynthApp.cpp       2008-06-04 22:32:03.973727640 +0800
 287 @@ -20,6 +20,8 @@
 288   *                                                                         *
 289   ***************************************************************************/
 290
 291 +#include <cstring>
 292 +#include <algorithm>
 293  #include <libpsynth/version.h>
 294  #include <sys/stat.h>
 295
 296 diff -Naur psychosynth-0.1.1.orig/libpsynth/table/Patcher.cpp psychosynth-0.1.1/libpsynth/table/Patcher.cpp
 297 --- psychosynth-0.1.1.orig/libpsynth/table/Patcher.cpp  2008-02-25 07:45:32.000000000 +0800
 298 +++ psychosynth-0.1.1/libpsynth/table/Patcher.cpp       2008-06-04 22:32:03.973727640 +0800
 299 @@ -20,6 +20,7 @@
 300   *                                                                         *
 301   ***************************************************************************/
 302
 303 +#include <algorithm>
 304  #include "table/Patcher.h"
 305
 306  using namespace std;
 307 diff -Naur psychosynth-0.1.1.orig/libpsynth/table/PatcherDynamic.cpp psychosynth-0.1.1/libpsynth/table/PatcherDynamic.cpp
 308 --- psychosynth-0.1.1.orig/libpsynth/table/PatcherDynamic.cpp   2008-04-06 02:49:20.000000000 +0800
 309 +++ psychosynth-0.1.1/libpsynth/table/PatcherDynamic.cpp        2008-06-04 22:32:03.973727640 +0800
 310 @@ -20,6 +20,7 @@
 311   *                                                                         *
 312   ***************************************************************************/
 313
 314 +#include <algorithm>
 315  #include "table/PatcherDynamic.h"
 316
 317  #include "object/Object.h"
 318 diff -Naur psychosynth-0.1.1.orig/libpsynth/table/Table.cpp psychosynth-0.1.1/libpsynth/table/Table.cpp
 319 --- psychosynth-0.1.1.orig/libpsynth/table/Table.cpp    2008-04-06 23:52:23.000000000 +0800
 320 +++ psychosynth-0.1.1/libpsynth/table/Table.cpp 2008-06-04 22:32:03.973727640 +0800
 321 @@ -20,6 +20,7 @@
 322   *                                                                         *
 323   ***************************************************************************/
 324
 325 +#include <algorithm>
 326  #include "table/Table.h"
 327  #include "output/OutputAlsa.h"
 328  #include "output/OutputOss.h"
 329 diff -Naur psychosynth-0.1.1.orig/libpsynth/table/TableObjectCreator.cpp psychosynth-0.1.1/libpsynth/table/TableObjectCreator.cpp
 330 --- psychosynth-0.1.1.orig/libpsynth/table/TableObjectCreator.cpp       2008-03-17 03:54:29.000000000 +0800
 331 +++ psychosynth-0.1.1/libpsynth/table/TableObjectCreator.cpp    2008-06-04 22:32:03.973727640 +0800
 332 @@ -20,6 +20,7 @@
 333   *                                                                         *
 334   ***************************************************************************/
 335
 336 +#include <algorithm>
 337  #include "table/TableObjectCreator.h"
 338  #include "table/Table.h"
 339
 340 diff -Naur psychosynth-0.1.1.orig/src/cli/PsychosynthCli.cpp psychosynth-0.1.1/src/cli/PsychosynthCli.cpp
 341 --- psychosynth-0.1.1.orig/src/cli/PsychosynthCli.cpp   2008-02-28 00:51:09.000000000 +0800
 342 +++ psychosynth-0.1.1/src/cli/PsychosynthCli.cpp        2008-06-04 22:32:03.977060955 +0800
 343 @@ -20,6 +20,7 @@
 344   *                                                                         *
 345   ***************************************************************************/
 346
 347 +#include <algorithm>
 348  #include <config.h>
 349
 350  #include <libpsynth/net/OSCClient.h>
 351 diff -Naur psychosynth-0.1.1.orig/src/gui3d/ConfWindow.cpp psychosynth-0.1.1/src/gui3d/ConfWindow.cpp
 352 --- psychosynth-0.1.1.orig/src/gui3d/ConfWindow.cpp     2008-04-07 01:29:39.000000000 +0800
 353 +++ psychosynth-0.1.1/src/gui3d/ConfWindow.cpp  2008-06-04 22:32:03.977060955 +0800
 354 @@ -20,6 +20,8 @@
 355   *                                                                         *
 356   ***************************************************************************/
 357
 358 +#include <cstring>
 359 +#include <cstdlib>
 360  #include "gui3d/ConfWindow.h"
 361
 362  using namespace psynth;
 363 diff -Naur psychosynth-0.1.1.orig/src/gui3d/DefaultSelectorPopulator.cpp psychosynth-0.1.1/src/gui3d/DefaultSelectorPopulator.cpp
 364 --- psychosynth-0.1.1.orig/src/gui3d/DefaultSelectorPopulator.cpp       2008-04-07 07:00:05.000000000 +0800
 365 +++ psychosynth-0.1.1/src/gui3d/DefaultSelectorPopulator.cpp    2008-06-04 22:32:03.980394759 +0800
 366 @@ -20,6 +20,8 @@
 367   *                                                                         *
 368   ***************************************************************************/
 369
 370 +#include <cstring>
 371 +#include <algorithm>
 372  #include <list>
 373  #include <string>
 374  #include <dirent.h>
 375 diff -Naur psychosynth-0.1.1.orig/src/gui3d/ElementManager.cpp psychosynth-0.1.1/src/gui3d/ElementManager.cpp
 376 --- psychosynth-0.1.1.orig/src/gui3d/ElementManager.cpp 2008-04-07 01:31:47.000000000 +0800
 377 +++ psychosynth-0.1.1/src/gui3d/ElementManager.cpp      2008-06-04 22:32:03.980394759 +0800
 378 @@ -20,6 +20,7 @@
 379   *                                                                         *
 380   ***************************************************************************/
 381
 382 +#include <algorithm>
 383  #include <CEGUI/CEGUI.h>
 384
 385  #include "gui3d/ElementManager.h"
 386 diff -Naur psychosynth-0.1.1.orig/src/gui3d/ElementProperties.cpp psychosynth-0.1.1/src/gui3d/ElementProperties.cpp
 387 --- psychosynth-0.1.1.orig/src/gui3d/ElementProperties.cpp      2008-03-31 07:43:03.000000000 +0800
 388 +++ psychosynth-0.1.1/src/gui3d/ElementProperties.cpp   2008-06-04 22:32:03.980394759 +0800
 389 @@ -20,6 +20,7 @@
 390   *                                                                         *
 391   ***************************************************************************/
 392
 393 +#include <algorithm>
 394  #include "gui3d/ElementProperties.h"
 395
 396  #define ELEMENT_EDITOR_WIDTH  200.0f
 397 diff -Naur psychosynth-0.1.1.orig/src/gui3d/NetworkWindow.cpp psychosynth-0.1.1/src/gui3d/NetworkWindow.cpp
 398 --- psychosynth-0.1.1.orig/src/gui3d/NetworkWindow.cpp  2008-02-27 00:35:59.000000000 +0800
 399 +++ psychosynth-0.1.1/src/gui3d/NetworkWindow.cpp       2008-06-04 22:32:03.980394759 +0800
 400 @@ -20,6 +20,7 @@
 401   *                                                                         *
 402   ***************************************************************************/
 403
 404 +#include <algorithm>
 405  #include "gui3d/NetworkWindow.h"
 406  #include <libpsynth/common/Misc.h>
 407
 408 diff -Naur psychosynth-0.1.1.orig/src/gui3d/Psychosynth3D.cpp psychosynth-0.1.1/src/gui3d/Psychosynth3D.cpp
 409 --- psychosynth-0.1.1.orig/src/gui3d/Psychosynth3D.cpp  2008-04-07 07:00:58.000000000 +0800
 410 +++ psychosynth-0.1.1/src/gui3d/Psychosynth3D.cpp       2008-06-04 22:32:03.983728213 +0800
 411 @@ -20,6 +20,8 @@
 412   *                                                                         *
 413   ***************************************************************************/
 414
 415 +#include <cstring>
 416 +#include <cstdlib>
 417  #include <config.h>
 418
 419  #include <libpsynth/version.h>
 420 diff -Naur psychosynth-0.1.1.orig/src/gui3d/RecordWindow.cpp psychosynth-0.1.1/src/gui3d/RecordWindow.cpp
 421 --- psychosynth-0.1.1.orig/src/gui3d/RecordWindow.cpp   2008-03-19 21:31:53.000000000 +0800
 422 +++ psychosynth-0.1.1/src/gui3d/RecordWindow.cpp        2008-06-04 22:32:03.983728213 +0800
 423 @@ -20,6 +20,7 @@
 424   *                                                                         *
 425   ***************************************************************************/
 426
 427 +#include <algorithm>
 428  #include <string>
 429
 430  #include "gui3d/RecordWindow.h"
 431 diff -Naur psychosynth-0.1.1.orig/src/gui3d/SelectorWindow.cpp psychosynth-0.1.1/src/gui3d/SelectorWindow.cpp
 432 --- psychosynth-0.1.1.orig/src/gui3d/SelectorWindow.cpp 2008-04-05 23:18:16.000000000 +0800
 433 +++ psychosynth-0.1.1/src/gui3d/SelectorWindow.cpp      2008-06-04 22:32:03.983728213 +0800
 434 @@ -20,6 +20,7 @@
 435   *                                                                         *
 436   ***************************************************************************/
 437
 438 +#include <algorithm>
 439  #include "gui3d/SelectorWindow.h"
 440
 441  using namespace std;
 442 diff -Naur psychosynth-0.1.1.orig/src/psynth.cpp psychosynth-0.1.1/src/psynth.cpp
 443 --- psychosynth-0.1.1.orig/src/psynth.cpp       2008-02-27 01:19:19.000000000 +0800
 444 +++ psychosynth-0.1.1/src/psynth.cpp    2008-06-04 22:32:03.983728213 +0800
 445 @@ -20,6 +20,8 @@
 446   *                                                                         *
 447   ***************************************************************************/
 448
 449 +#include <cstring>
 450 +#include <algorithm>
 451  #include "cli/PsychosynthCli.h"
 452
 453  int main(int argc, const char *argv[])