summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/fluxbox.cc44
1 files changed, 24 insertions, 20 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 7e60062..6338f11 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.62 2002/07/14 01:00:23 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.63 2002/08/02 13:00:23 fluxgen Exp $
26 26
27//Use GNU extensions 27//Use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -58,38 +58,36 @@
58#include <X11/Xatom.h> 58#include <X11/Xatom.h>
59#include <X11/keysym.h> 59#include <X11/keysym.h>
60 60
61#ifdef SHAPE 61#ifdef SHAPE
62#include <X11/extensions/shape.h> 62#include <X11/extensions/shape.h>
63#endif // SHAPE 63#endif // SHAPE
64 64
65#ifdef HAVE_STDIO_H 65#include <cstdio>
66# include <stdio.h>
67#endif // HAVE_STDIO_H
68 66
69#ifdef STDC_HEADERS 67#ifdef STDC_HEADERS
70# include <stdlib.h> 68#include <stdlib.h>
71# include <string.h> 69#include <string.h>
72#endif // STDC_HEADERS 70#endif // STDC_HEADERS
73 71
74#ifdef HAVE_UNISTD_H 72#ifdef HAVE_UNISTD_H
75# include <sys/types.h> 73#include <sys/types.h>
76# include <unistd.h> 74#include <unistd.h>
77#endif // HAVE_UNISTD_H 75#endif // HAVE_UNISTD_H
78 76
79#ifdef HAVE_SYS_PARAM_H 77#ifdef HAVE_SYS_PARAM_H
80# include <sys/param.h> 78#include <sys/param.h>
81#endif // HAVE_SYS_PARAM_H 79#endif // HAVE_SYS_PARAM_H
82 80
83#ifndef MAXPATHLEN 81#ifndef MAXPATHLEN
84#define MAXPATHLEN 255 82#define MAXPATHLEN 255
85#endif // MAXPATHLEN 83#endif // MAXPATHLEN
86 84
87#ifdef HAVE_SYS_SELECT_H 85#ifdef HAVE_SYS_SELECT_H
88# include <sys/select.h> 86#include <sys/select.h>
89#endif // HAVE_SYS_SELECT_H 87#endif // HAVE_SYS_SELECT_H
90 88
91#ifdef HAVE_SIGNAL_H 89#ifdef HAVE_SIGNAL_H
92# include <signal.h> 90#include <signal.h>
93#endif // HAVE_SIGNAL_H 91#endif // HAVE_SIGNAL_H
94 92
95#ifdef HAVE_SYS_SIGNAL_H 93#ifdef HAVE_SYS_SIGNAL_H
@@ -124,14 +122,20 @@
124using namespace std; 122using namespace std;
125 123
126#ifndef HAVE_BASENAME 124#ifndef HAVE_BASENAME
127static inline char *basename (char *); 125namespace {
128static inline char *basename (char *s) { 126
127char *basename (char *s) {
129 char *save = s; 128 char *save = s;
130 129
131 while (*s) if (*s++ == '/') save = s; 130 while (*s) {
131 if (*s++ == '/')
132 save = s;
133 }
132 134
133 return save; 135 return save;
134} 136}
137};
138
135#endif // HAVE_BASENAME 139#endif // HAVE_BASENAME
136 140
137#define RC_PATH "fluxbox" 141#define RC_PATH "fluxbox"