1
1

Rearanged #include's, so glib.h follows fs.h, but preceed util.h and mad.h,

as this required for proper defenition of memory debbuger.
Этот коммит содержится в:
Timur Bakeyev 1999-01-19 02:34:37 +00:00
родитель 8cdf4d3f6f
Коммит f28489d29a
6 изменённых файлов: 16 добавлений и 4 удалений

Просмотреть файл

@ -1,3 +1,9 @@
Tue Jan 19 05:28:04 1999 Timur Bakeyev <mc@bat.ru>
* ext.c, filenot.c, main.c, screen.c, treestore.c: add missed #include's
and moved glib.h so, it follows "fs.h", but preceed "util.h" and "mad.h".
There were conflicts during compilation with MAD and GLibed vfs.
Mon Jan 18 21:23:29 1999 Paul Sheer <psheer@obsidian.co.za> Mon Jan 18 21:23:29 1999 Paul Sheer <psheer@obsidian.co.za>
* cmd.c: update_panels (UP_OPTIMIZE, UP_KEEPSEL); instead * cmd.c: update_panels (UP_OPTIMIZE, UP_KEEPSEL); instead

Просмотреть файл

@ -34,11 +34,14 @@
#include <malloc.h> #include <malloc.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include "mad.h"
#include "user.h" #include "user.h"
#include "main.h" #include "main.h"
#include "fs.h" #include "fs.h"
#include <glib.h>
#include "util.h" #include "util.h"
#include "mad.h"
#include "dialog.h" #include "dialog.h"
#include "global.h" #include "global.h"
#include "ext.h" #include "ext.h"
@ -52,7 +55,6 @@
#ifdef SCO_FLAVOR #ifdef SCO_FLAVOR
#include <sys/wait.h> #include <sys/wait.h>
#endif /* SCO_FLAVOR */ #endif /* SCO_FLAVOR */
#include <glib.h>
/* If set, we execute the file command to check the file type */ /* If set, we execute the file command to check the file type */
int use_file_to_check_type = 1; int use_file_to_check_type = 1;

Просмотреть файл

@ -12,6 +12,7 @@
#include <string.h> #include <string.h>
#include <malloc.h> #include <malloc.h>
#include "util.h" #include "util.h"
#include "mad.h"
#include <errno.h> #include <errno.h>
#include "../vfs/vfs.h" #include "../vfs/vfs.h"

Просмотреть файл

@ -84,6 +84,8 @@
# include "gcorba.h" # include "gcorba.h"
#endif #endif
#include <glib.h>
/* Program include files */ /* Program include files */
#include "x.h" #include "x.h"
#include "mad.h" #include "mad.h"
@ -138,7 +140,6 @@
#include "../vfs/vfs.h" #include "../vfs/vfs.h"
#include "../vfs/extfs.h" #include "../vfs/extfs.h"
#include <glib.h>
#include "popt.h" #include "popt.h"
/* "$Id$" */ /* "$Id$" */

Просмотреть файл

@ -31,6 +31,8 @@
#endif #endif
/*#include "mc.h"*/ /*#include "mc.h"*/
#include <glib.h>
#include "mem.h" #include "mem.h"
#include "mad.h" #include "mad.h"
#include "global.h" #include "global.h"
@ -54,7 +56,6 @@
#include "widget.h" #include "widget.h"
#include "../vfs/vfs.h" #include "../vfs/vfs.h"
#include "../vfs/extfs.h" #include "../vfs/extfs.h"
#include <glib.h>
#ifdef NEEDS_DRIVE_H #ifdef NEEDS_DRIVE_H
# include "drive.h" # include "drive.h"
#endif #endif

Просмотреть файл

@ -47,6 +47,7 @@
#include "fs.h" #include "fs.h"
#include "../vfs/vfs.h" #include "../vfs/vfs.h"
#include "util.h" #include "util.h"
#include "mad.h"
#include "treestore.h" #include "treestore.h"
#ifdef OS2_NT #ifdef OS2_NT
# include <io.h> # include <io.h>