diff options
author | Paul Smith <psmith@gnu.org> | 2023-04-03 07:48:51 -0400 |
---|---|---|
committer | Paul Smith <psmith@gnu.org> | 2023-04-03 07:48:51 -0400 |
commit | c4329fb9531d75f627a02636d1347726f911ab01 (patch) | |
tree | 34d43d2095d46148be03c774d741aedcdf2ed619 | |
parent | 971b02d58ee2d19d8ba0c7c9813f02fa86c8fd0c (diff) | |
download | make-git-c4329fb9531d75f627a02636d1347726f911ab01.tar.gz |
Move local headers after system headers
Avoid compiler warnings on Windows by moving local headers after
system headers.
* src/job.c: Move all headers other than makeint.h.
* src/main.c: Ditto.
* src/read.c: Ditto.
-rw-r--r-- | src/job.c | 20 | ||||
-rw-r--r-- | src/main.c | 23 | ||||
-rw-r--r-- | src/read.c | 18 |
3 files changed, 31 insertions, 30 deletions
@@ -19,16 +19,6 @@ this program. If not, see <https://www.gnu.org/licenses/>. */ #include <assert.h> #include <string.h> -#include "job.h" -#include "debug.h" -#include "filedef.h" -#include "commands.h" -#include "variable.h" -#include "os.h" -#include "dep.h" -#include "shuffle.h" -#include "warning.h" - /* Default shell to use. */ #if MK_OS_W32 # include <windows.h> @@ -196,6 +186,16 @@ int getgid (); int getloadavg (double loadavg[], int nelem); #endif +#include "job.h" +#include "debug.h" +#include "filedef.h" +#include "commands.h" +#include "variable.h" +#include "os.h" +#include "dep.h" +#include "shuffle.h" +#include "warning.h" + /* Different systems have different requirements for pid_t. Plus we have to support gettext string translation... Argh. */ static const char * @@ -15,17 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include "makeint.h" -#include "os.h" -#include "filedef.h" -#include "dep.h" -#include "variable.h" -#include "job.h" -#include "commands.h" -#include "rule.h" -#include "debug.h" -#include "getopt.h" -#include "shuffle.h" -#include "warning.h" #include <assert.h> #if MK_OS_W32 @@ -93,6 +82,18 @@ void exit (int) NORETURN; double atof (); #endif +#include "os.h" +#include "filedef.h" +#include "dep.h" +#include "variable.h" +#include "job.h" +#include "commands.h" +#include "rule.h" +#include "debug.h" +#include "getopt.h" +#include "shuffle.h" +#include "warning.h" + static void clean_jobserver (int status); static void print_data_base (void); static void print_version (void); @@ -18,6 +18,15 @@ this program. If not, see <https://www.gnu.org/licenses/>. */ #include <assert.h> +#if MK_OS_W32 +# include <windows.h> +# include "sub_proc.h" +#elif MK_OS_VMS +struct passwd *getpwnam (char *name); +#else +# include <pwd.h> +#endif + #include "filedef.h" #include "dep.h" #include "job.h" @@ -29,15 +38,6 @@ this program. If not, see <https://www.gnu.org/licenses/>. */ #include "hash.h" #include "warning.h" -#if MK_OS_W32 -# include <windows.h> -# include "sub_proc.h" -#elif MK_OS_VMS -struct passwd *getpwnam (char *name); -#else -# include <pwd.h> -#endif - /* A 'struct ebuffer' controls the origin of the makefile we are currently eval'ing. */ |