Changeset 3140 for trunk/src/kmk/commands.h

Timestamp:

Mar 14, 2018, 10:28:10 PM (7 years ago)

Author:

bird

Message:

kmk: Merged in changes from GNU make 4.2.1 (2e55f5e4abdc0e38c1d64be703b446695e70b3b6 / ​https://git.savannah.gnu.org/git/make.git).

Location:

trunk/src/kmk

Files:

• . (modified) (1 prop)
• commands.h (modified) (4 diffs)

trunk/src/kmk/commands.h

@@ -1 +1 @@
 /* Definition of data structures describing shell commands for GNU Make.
-Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
-1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-2010 Free Software Foundation, Inc.
+Copyright (C) 1988-2016 Free Software Foundation, Inc.
 This file is part of GNU Make.
 
@@ -22 +20 @@
 struct commands
   {
-    struct floc fileinfo;       /* Where commands were defined.  */
-    char *commands;             /* Commands text.  */
-    unsigned int ncommand_lines;/* Number of command lines.  */
-    char **command_lines;       /* Commands chopped up into lines.  */
+    floc fileinfo;              /* Where commands were defined.  */
+    char *commands;             /* Commands text.  */
+    char **command_lines;       /* Commands chopped up into lines.  */
 #ifdef CONFIG_WITH_COMMANDS_FUNC
-    short *lines_flags;         /* One set of flag bits for each line.  */
+    unsigned short *lines_flags;/* One set of flag bits for each line.  */
 #else
-    char *lines_flags;          /* One set of flag bits for each line.  */
+    unsigned char *lines_flags; /* One set of flag bits for each line.  */
 #endif
-    int any_recurse;            /* Nonzero if any `lines_recurse' elt has */
-                                /* the COMMANDS_RECURSE bit set.  */
+    unsigned short ncommand_lines;/* Number of command lines.  */
+    char recipe_prefix;         /* Recipe prefix for this command set.  */
+    unsigned int any_recurse:1; /* Nonzero if any 'lines_flags' elt has */
+                                /* the COMMANDS_RECURSE bit set.  */
 #ifdef CONFIG_WITH_MEMORY_OPTIMIZATIONS
     int refs;                   /* References.  */
@@ -38 +37 @@
   };
 
-/* Bits in `lines_flags'.  */
-#define COMMANDS_RECURSE        1 /* Recurses: + or $(MAKE).  */
-#define COMMANDS_SILENT         2 /* Silent: @.  */
-#define COMMANDS_NOERROR        4 /* No errors: -.  */
+/* Bits in 'lines_flags'.  */
+#define COMMANDS_RECURSE        1 /* Recurses: + or $(MAKE).  */
+#define COMMANDS_SILENT         2 /* Silent: @.  */
+#define COMMANDS_NOERROR        4 /* No errors: -.  */
 #ifdef CONFIG_WITH_EXTENDED_NOTPARALLEL
 # define COMMANDS_NOTPARALLEL   32  /* kmk: The commands must be executed alone. */
@@ -53 +52 @@
 #endif
 
+RETSIGTYPE fatal_error_signal (int sig);
 void execute_file_commands (struct file *file);
 void print_commands (const struct commands *cmds);