* fs.h: Correctly include <sys/param.h>.

* x.h: Include "global.h".  Move all contents ...
* global.h: Here.
This commit is contained in:
Pavel Roskin 2001-08-19 16:23:24 +00:00
parent 680d7fd55c
commit 05adbccda8
4 changed files with 26 additions and 16 deletions

View File

@ -1,5 +1,9 @@
2001-08-19 Pavel Roskin <proski@gnu.org>
* fs.h: Correctly include <sys/param.h>.
* x.h: Include "global.h". Move all contents ...
* global.h: Here.
* regex.c (regex_compile): Warning fix for ambiguous else.
2001-08-18 Pavel Roskin <proski@gnu.org>

View File

@ -6,7 +6,7 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#ifndef HAS_NO_SYS_PARAM_H
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#include <sys/stat.h>

View File

@ -2,12 +2,30 @@
#define __GLOBAL_H
#include <stdlib.h> /* for free() and other usefull routins */
#include "fs.h"
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#include <glib.h>
#ifdef HAVE_GNOME
# define GNOME_REGEX_H
# include <gnome.h>
#endif
#include "fs.h"
#include "mem.h"
#include "util.h"
#include "mad.h"
#ifndef HAVE_X
# include "textconf.h"
#endif
#ifdef HAVE_GNOME
# include "gconf.h"
# include "gmain.h"
#endif
extern char *home_dir;
#ifdef min

14
src/x.h
View File

@ -1,18 +1,6 @@
#ifndef __X_H
#define __X_H
#ifndef HAVE_X
# include "textconf.h"
#endif
#ifdef HAVE_GNOME
# ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
# endif
# define GNOME_REGEX_H
# include <gnome.h>
# include "gconf.h"
# include "gmain.h"
#endif
#include "global.h"
#endif /* __X_H */