aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2007-12-14 22:21:39 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2007-12-14 22:21:39 (GMT)
commit90f4f1ecc1635fd5d144f86d64b1674958d0a59f (patch)
treeaa07b88aac7b694e7fd5ded55a89a93ab8837c50
parentd90befb43007274c03fb1783b3236072120e78e1 (diff)
downloadfluxbox_pavel-90f4f1ecc1635fd5d144f86d64b1674958d0a59f.zip
fluxbox_pavel-90f4f1ecc1635fd5d144f86d64b1674958d0a59f.tar.bz2
fix compile issue with gcc 4.3
-rw-r--r--ChangeLog3
-rw-r--r--src/main.cc6
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ed65f7..6981683 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0.1: 2Changes for 1.0.1:
3*07/12/14:
4 * Fix compiling with gcc 4.3 (thanks Dmitry E. Oboukhov)
5 main.cc
3*07/12/13: 6*07/12/13:
4 * Fix configure option --with-style (thanks Slava Semushin) 7 * Fix configure option --with-style (thanks Slava Semushin)
5 configure.in Makefile.am 8 configure.in Makefile.am
diff --git a/src/main.cc b/src/main.cc
index e4e16ac..ab18f6c 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -45,6 +45,12 @@
45 #include <stdlib.h> 45 #include <stdlib.h>
46#endif 46#endif
47 47
48#ifdef HAVE_CSTRING
49 #include <cstring>
50#else
51 #include <string.h>
52#endif
53
48#include <iostream> 54#include <iostream>
49#include <fstream> 55#include <fstream>
50#include <stdexcept> 56#include <stdexcept>