github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2024-12-28 05:40:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move local headers after system headers

Browse Source 
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.
This commit is contained in:
Paul Smith 2023-04-03 07:48:51 -04:00
parent 971b02d58e
commit c4329fb953
3 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/job.c
View File

@ -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 *

23
src/main.c
View File

@ -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
src/read.c
View File

@ -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.
*/