Merge lib/utilunix.h into lib/util.h.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>

lib/Makefile.am

@@ -23,7 +23,7 @@ SUBLIB_includes = \
 	widget.h
 
 SRC_mc_utils = \
-	utilunix.c utilunix.h \
+	utilunix.c \
 	unixcompat.h \
 	util.c util.h
 

lib/util.h

@@ -57,6 +57,11 @@
 /* Difference or zero */
 #define DOZ(a, b) ((a) > (b) ? (a) - (b) : 0)
 
+/* flags for shell_execute */
+#define EXECUTE_INTERNAL (1 << 0)
+#define EXECUTE_AS_SHELL (1 << 2)
+#define EXECUTE_HIDE     (1 << 3)
+
 /*** enums ***************************************************************************************/
 
 /* Pathname canonicalization */

lib/utilunix.c

@@ -70,8 +70,6 @@
 #include "lib/charsets.h"
 #endif
 
-#include "utilunix.h"
-
 /*** global variables ****************************************************************************/
 
 struct sigaction startup_handler;

lib/utilunix.h

@@ -1,25 +0,0 @@
-/** \file  execute.h
- *  \brief Header: execution routines
- */
-
-#ifndef MC__UTILUNIX_H
-#define MC__UTILUNIX_H
-
-/*** typedefs(not structures) and defined constants **********************************************/
-
-/* flags for shell_execute */
-#define EXECUTE_INTERNAL (1 << 0)
-#define EXECUTE_AS_SHELL (1 << 2)
-#define EXECUTE_HIDE     (1 << 3)
-
-/*** enums ***************************************************************************************/
-
-/*** structures declarations (and typedefs of structures)*****************************************/
-
-/*** global variables defined in .c file *********************************************************/
-
-/*** declarations of public functions ************************************************************/
-
-/*** inline functions ****************************************************************************/
-
-#endif /* MC__UTILUNIX_H */

src/execute.h

@@ -5,7 +5,7 @@
 #ifndef MC__EXECUTE_H
 #define MC__EXECUTE_H
 
-#include "lib/utilunix.h"
+#include "lib/util.h"
 #include "lib/vfs/vfs.h"
 
 /*** typedefs(not structures) and defined constants **********************************************/

src/vfs/sfs/sfs.c

@@ -47,8 +47,6 @@
 #include "lib/util.h"
 #include "lib/widget.h"         /* D_ERROR, D_NORMAL */
 
-#include "src/execute.h"        /* EXECUTE_AS_SHELL */
-
 #include "lib/vfs/vfs.h"
 #include "lib/vfs/utilvfs.h"
 #include "lib/vfs/xdirentry.h"

tests/lib/utilunix__my_system-fork_child.c

@@ -28,7 +28,6 @@
 #include "tests/mctest.h"
 
 #include "lib/util.h"
-#include "lib/utilunix.h"
 
 #include "utilunix__my_system-common.c"
 

tests/lib/utilunix__my_system-fork_child_shell.c

@@ -28,7 +28,6 @@
 #include "tests/mctest.h"
 
 #include "lib/util.h"
-#include "lib/utilunix.h"
 
 #include "utilunix__my_system-common.c"
 

tests/lib/utilunix__my_system-fork_fail.c

@@ -31,7 +31,6 @@
 #include <unistd.h>
 
 #include "lib/util.h"
-#include "lib/utilunix.h"
 
 #include "utilunix__my_system-common.c"