config: Where present, ensure config-util.h precedes config.h
gnulib defines go in config-util.h, and we need to know whether to provide duplicates in config.h or not. Signed-off-by: Robbie Harwood <rharwood@redhat.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
parent
f8280160d0
commit
2cd52835fc
@ -20,8 +20,8 @@
|
|||||||
/* When using the disk, make a reference to this module. Otherwise
|
/* When using the disk, make a reference to this module. Otherwise
|
||||||
the user will end up with a useless module :-). */
|
the user will end up with a useless module :-). */
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
#include <config-util.h>
|
#include <config-util.h>
|
||||||
|
#include <config.h>
|
||||||
|
|
||||||
#include <grub/dl.h>
|
#include <grub/dl.h>
|
||||||
#include <grub/disk.h>
|
#include <grub/disk.h>
|
||||||
|
|||||||
@ -31,6 +31,7 @@ cat <<EOF
|
|||||||
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <../config-util.h>
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
for i in $*; do
|
for i in $*; do
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
#include <config-util.h>
|
#include <config-util.h>
|
||||||
|
#include <config.h>
|
||||||
|
|
||||||
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
|
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
|
||||||
#pragma GCC diagnostic ignored "-Wmissing-declarations"
|
#pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
#include <config-util.h>
|
#include <config-util.h>
|
||||||
|
#include <config.h>
|
||||||
|
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
#include <config-util.h>
|
#include <config-util.h>
|
||||||
|
#include <config.h>
|
||||||
|
|
||||||
#include <grub/emu/hostdisk.h>
|
#include <grub/emu/hostdisk.h>
|
||||||
#include <grub/emu/exec.h>
|
#include <grub/emu/exec.h>
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
#include <config-util.h>
|
#include <config-util.h>
|
||||||
|
#include <config.h>
|
||||||
|
|
||||||
#include <grub/i18n.h>
|
#include <grub/i18n.h>
|
||||||
#include <grub/emu/net.h>
|
#include <grub/emu/net.h>
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
#include <config-util.h>
|
#include <config-util.h>
|
||||||
|
#include <config.h>
|
||||||
|
|
||||||
#include <grub/util/misc.h>
|
#include <grub/util/misc.h>
|
||||||
#include <grub/i18n.h>
|
#include <grub/i18n.h>
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
#include <config.h>
|
|
||||||
#include <config-util.h>
|
#include <config-util.h>
|
||||||
|
#include <config.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
#include <config-util.h>
|
#include <config-util.h>
|
||||||
|
#include <config.h>
|
||||||
|
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
#include <config-util.h>
|
#include <config-util.h>
|
||||||
|
#include <config.h>
|
||||||
|
|
||||||
#include <grub/emu/hostdisk.h>
|
#include <grub/emu/hostdisk.h>
|
||||||
#include <grub/emu/exec.h>
|
#include <grub/emu/exec.h>
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
#include <config.h>
|
|
||||||
#include <config-util.h>
|
#include <config-util.h>
|
||||||
|
#include <config.h>
|
||||||
|
|
||||||
#include <sys/times.h>
|
#include <sys/times.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
#include <config-util.h>
|
#include <config-util.h>
|
||||||
|
#include <config.h>
|
||||||
|
|
||||||
#include <grub/dl.h>
|
#include <grub/dl.h>
|
||||||
#include <grub/misc.h>
|
#include <grub/misc.h>
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
#include <config-util.h>
|
#include <config-util.h>
|
||||||
|
#include <config.h>
|
||||||
|
|
||||||
#include <grub/term.h>
|
#include <grub/term.h>
|
||||||
#include <grub/types.h>
|
#include <grub/types.h>
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <config-util.h>
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
|
#include <config-util.h>
|
||||||
|
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
#include <config-util.h>
|
#include <config-util.h>
|
||||||
|
#include <config.h>
|
||||||
|
|
||||||
#include <grub/emu/hostfile.h>
|
#include <grub/emu/hostfile.h>
|
||||||
#include <grub/emu/config.h>
|
#include <grub/emu/config.h>
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
#include <config.h>
|
|
||||||
#include <config-util.h>
|
#include <config-util.h>
|
||||||
|
#include <config.h>
|
||||||
|
|
||||||
#include <grub/emu/misc.h>
|
#include <grub/emu/misc.h>
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
#include <config-util.h>
|
#include <config-util.h>
|
||||||
|
#include <config.h>
|
||||||
|
|
||||||
#include <grub/dl.h>
|
#include <grub/dl.h>
|
||||||
#include <grub/misc.h>
|
#include <grub/misc.h>
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
#include <config-util.h>
|
#include <config-util.h>
|
||||||
|
#include <config.h>
|
||||||
|
|
||||||
#include <grub/term.h>
|
#include <grub/term.h>
|
||||||
#include <grub/misc.h>
|
#include <grub/misc.h>
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
#include <config-util.h>
|
#include <config-util.h>
|
||||||
|
#include <config.h>
|
||||||
#include <grub/util/misc.h>
|
#include <grub/util/misc.h>
|
||||||
#include <grub/osdep/hostfile.h>
|
#include <grub/osdep/hostfile.h>
|
||||||
#include <grub/util/windows.h>
|
#include <grub/util/windows.h>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user