diff options
| author | Mathias Gumz <mathias gumz at gmail com> | 2014-04-11 15:42:09 (GMT) |
|---|---|---|
| committer | Mathias Gumz <mathias gumz at gmail com> | 2014-04-11 15:42:40 (GMT) |
| commit | e105de7d46c4936790754857d8c789f3c7fccd87 (patch) | |
| tree | caaf0481ae7d743507f67d7d4e3977f31b153f65 /src/main.cc | |
| parent | bc272ba4aed707522cb458d659940567ac6fc386 (diff) | |
| parent | 7541054b299bbd61310ab0456cf4f25b7a672de3 (diff) | |
| download | fluxbox-e105de7d46c4936790754857d8c789f3c7fccd87.zip fluxbox-e105de7d46c4936790754857d8c789f3c7fccd87.tar.bz2 | |
merge Sami Kerola's new build-system
Diffstat (limited to 'src/main.cc')
| -rw-r--r-- | src/main.cc | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/main.cc b/src/main.cc index ebe7718..bff3be6 100644 --- a/src/main.cc +++ b/src/main.cc | |||
| @@ -20,10 +20,6 @@ | |||
| 20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
| 21 | // DEALINGS IN THE SOFTWARE. | 21 | // DEALINGS IN THE SOFTWARE. |
| 22 | 22 | ||
| 23 | #ifdef HAVE_CONFIG_H | ||
| 24 | #include "config.h" | ||
| 25 | #endif // HAVE_CONFIG_H | ||
| 26 | |||
| 27 | #include "fluxbox.hh" | 23 | #include "fluxbox.hh" |
| 28 | #include "version.h" | 24 | #include "version.h" |
| 29 | #include "defaults.hh" | 25 | #include "defaults.hh" |
| @@ -37,6 +33,18 @@ | |||
| 37 | #define _GNU_SOURCE | 33 | #define _GNU_SOURCE |
| 38 | #endif // _GNU_SOURCE | 34 | #endif // _GNU_SOURCE |
| 39 | 35 | ||
| 36 | #ifdef HAVE_CSTDLIB | ||
| 37 | #include <cstdlib> | ||
| 38 | #else | ||
| 39 | #include <stdlib.h> | ||
| 40 | #endif | ||
| 41 | |||
| 42 | #ifdef HAVE_CSTRING | ||
| 43 | #include <cstring> | ||
| 44 | #else | ||
| 45 | #include <string.h> | ||
| 46 | #endif | ||
| 47 | |||
| 40 | #ifdef HAVE_UNISTD_H | 48 | #ifdef HAVE_UNISTD_H |
| 41 | #include <unistd.h> | 49 | #include <unistd.h> |
| 42 | #endif | 50 | #endif |