summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-08-15 11:19:21 (GMT)
committerfluxgen <fluxgen>2002-08-15 11:19:21 (GMT)
commit04169d609d8ca859ca83d39ede0b32ed5170232d (patch)
tree0373b4dbc92bb4b4210e69f7a5788d2377b6a4af
parent1660aeb26881e5ccabcf216736c560af25186273 (diff)
downloadfluxbox_lack-04169d609d8ca859ca83d39ede0b32ed5170232d.zip
fluxbox_lack-04169d609d8ca859ca83d39ede0b32ed5170232d.tar.bz2
changed order of includes
-rw-r--r--util/bsetroot.cc20
-rw-r--r--util/bsetroot.hh6
2 files changed, 12 insertions, 14 deletions
diff --git a/util/bsetroot.cc b/util/bsetroot.cc
index d94d43d..eef21a7 100644
--- a/util/bsetroot.cc
+++ b/util/bsetroot.cc
@@ -1,20 +1,18 @@
1#include "bsetroot.hh"
2
3#include "../src/i18n.hh"
4
1#ifdef HAVE_CONFIG_H 5#ifdef HAVE_CONFIG_H
2# include "../config.h" 6# include "../config.h"
3#endif // HAVE_CONFIG_H 7#endif // HAVE_CONFIG_H
4 8
5#ifdef STDC_HEADERS 9#include <X11/Xatom.h>
6# include <string.h>
7# include <stdlib.h>
8#endif // STDC_HEADERS
9
10#ifdef HAVE_STDIO_H
11# include <stdio.h>
12#endif // HAVE_STDIO_H
13
14#include "../src/i18n.hh"
15#include "bsetroot.hh"
16 10
11#include <cstring>
12#include <cstdlib>
13#include <cstdio>
17#include <iostream> 14#include <iostream>
15
18using namespace std; 16using namespace std;
19 17
20bsetroot::bsetroot(int argc, char **argv, char *dpy_name) 18bsetroot::bsetroot(int argc, char **argv, char *dpy_name)
diff --git a/util/bsetroot.hh b/util/bsetroot.hh
index bf55015..41d298b 100644
--- a/util/bsetroot.hh
+++ b/util/bsetroot.hh
@@ -1,5 +1,5 @@
1#ifndef __bsetroot2_hh 1#ifndef BSETROOT_HH
2#define __bsetroot2_hh 2#define BSETROOT_HH
3 3
4#include "../src/BaseDisplay.hh" 4#include "../src/BaseDisplay.hh"
5#include "../src/Image.hh" 5#include "../src/Image.hh"
@@ -30,4 +30,4 @@ protected:
30}; 30};
31 31
32 32
33#endif // __bsetroot2_hh 33#endif // BSETROOT_HH