Switch to unified view

a/upmpd/conftree.cxx b/upmpd/conftree.cxx
...
...
14
 *   Free Software Foundation, Inc.,
14
 *   Free Software Foundation, Inc.,
15
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
15
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
16
 */
16
 */
17
#ifndef TEST_CONFTREE
17
#ifndef TEST_CONFTREE
18
18
19
#include <unistd.h> // for access(2)
19
#include "conftree.hxx"
20
#include <ctype.h>
21
#include <fnmatch.h>
22
#include <sys/stat.h>
23
20
24
#include <fstream>
21
#include <fnmatch.h>                    // for fnmatch
25
#include <sstream>
22
#include <stdlib.h>                     // for abort
26
#include <algorithm>
23
#include <sys/stat.h>                   // for stat, st_mtime
27
#include <iostream>
24
#include <unistd.h>                     // for access
28
#include <cstring>
25
26
#include <algorithm>                    // for find
27
#include <cstring>                      // for strlen
28
#include <fstream>                      // for ifstream, ofstream
29
#include <iostream>                     // for cerr, cout
30
#include <sstream>                      // for stringstream
31
#include <utility>                      // for pair
32
33
#include "upmpdutils.hxx"               // for trimstring, path_catslash, etc
29
34
30
using namespace std;
35
using namespace std;
31
32
#include "conftree.hxx"
33
#include "upmpdutils.hxx"
34
36
35
#undef DEBUG
37
#undef DEBUG
36
#ifdef DEBUG
38
#ifdef DEBUG
37
#define LOGDEB(X) fprintf X
39
#define LOGDEB(X) fprintf X
38
#else
40
#else