From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:30 +0000 (-0700)
Subject: Include sysmacros.h directly as mandated by glibc-2.25.
X-Git-Tag: stable-10.2.0~295
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69b7e1f9423fe565b2cbe2ec784068b7f55a8247;p=thirdparty%2Fopen-vm-tools.git

Include sysmacros.h directly as mandated by glibc-2.25.

glibc-2.25 generates a deprecation warning for using 'major'
macro without including sysmacros.h.
https://sourceware.org/glibc/wiki/Release/2.25

This is breaking Fedora builds of open-vm-tools because
Fedora 26 is switching to glibc-2.25.
---

diff --git a/open-vm-tools/lib/wiper/wiperPosix.c b/open-vm-tools/lib/wiper/wiperPosix.c
index d389eeeab..b41bd72b0 100644
--- a/open-vm-tools/lib/wiper/wiperPosix.c
+++ b/open-vm-tools/lib/wiper/wiperPosix.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2004-2016 VMware, Inc. All rights reserved.
+ * Copyright (C) 2004-2017 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -30,6 +30,9 @@
 #include <stdio.h>
 #include <sys/stat.h>
 #if defined(__linux__) || defined(sun)
+# if defined(__linux__)
+#  include <sys/sysmacros.h>
+# endif
 # include <sys/vfs.h>
 #elif defined(__FreeBSD__) || defined(__APPLE__)
 # include <sys/param.h>
@@ -44,7 +47,6 @@
 
 #include "vmware.h"
 #include "wiper.h"
-#include "util.h"
 #include "str.h"
 #include "strutil.h"
 #include "fileIO.h"