From a0b6c98d59de530f615f069bb87ed8c7d71f2373 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Thu, 23 Oct 2014 13:54:31 +0100
Subject: [PATCH] Fix preprocessor indentation in libvirt.h.in

The cfg.mk rule for checking preprocessor indentation was
mistakenly missing the libvirt.h.in file due to bad file
extension matching rule. Fix that and the resolve the
incorrect indentation that is identified.
---
 cfg.mk                       |  2 +-
 include/libvirt/libvirt.h.in | 76 ++++++++++++++++++------------------
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index 501530f7a7..682687a3e7 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -680,7 +680,7 @@ sc_require_whitespace_in_translation:
 # Enforce recommended preprocessor indentation style.
 sc_preprocessor_indentation:
 	@if cppi --version >/dev/null 2>&1; then			\
-	  $(VC_LIST_EXCEPT) | grep '\.[ch]$$' | xargs cppi -a -c	\
+	  $(VC_LIST_EXCEPT) | grep -E '\.[ch](\.in)?$$' | xargs cppi -a -c	\
 	    || { echo '$(ME): incorrect preprocessor indentation' 1>&2;	\
 		exit 1; };						\
 	else								\
diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index 66ed0c2485..77069789fa 100644
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -24,36 +24,36 @@
  */
 
 #ifndef __VIR_VIRLIB_H__
-#define __VIR_VIRLIB_H__
+# define __VIR_VIRLIB_H__
 
-#include <sys/types.h>
+# include <sys/types.h>
 
-#ifdef __cplusplus
+# ifdef __cplusplus
 extern "C" {
-#endif
+# endif
 
-#ifndef VIR_DEPRECATED
+# ifndef VIR_DEPRECATED
   /* The feature is present in gcc-3.1 and newer.  */
-# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
-#  define VIR_DEPRECATED __attribute__((__deprecated__))
-# else
-#  define VIR_DEPRECATED /* nothing */
-# endif
-#endif /* VIR_DEPRECATED */
+#  if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
+#   define VIR_DEPRECATED __attribute__((__deprecated__))
+#  else
+#   define VIR_DEPRECATED /* nothing */
+#  endif
+# endif /* VIR_DEPRECATED */
 
-#ifdef WIN32
-# ifdef LIBVIRT_STATIC
-#  define VIR_EXPORT_VAR extern
-# else
-#  ifdef IN_LIBVIRT
-#   define VIR_EXPORT_VAR __declspec(dllexport)
+# ifdef WIN32
+#  ifdef LIBVIRT_STATIC
+#   define VIR_EXPORT_VAR extern
 #  else
-#   define VIR_EXPORT_VAR __declspec(dllimport) extern
+#   ifdef IN_LIBVIRT
+#    define VIR_EXPORT_VAR __declspec(dllexport)
+#   else
+#    define VIR_EXPORT_VAR __declspec(dllimport) extern
+#   endif
 #  endif
+# else
+#  define VIR_EXPORT_VAR extern
 # endif
-#else
-# define VIR_EXPORT_VAR extern
-#endif
 
 /* General note - in the header files, any linear enumeration which
  * might be expanded in the future has an optional *_LAST value that
@@ -70,7 +70,7 @@ extern "C" {
  * version * 1,000,000 + minor * 1000 + micro
  */
 
-#define LIBVIR_VERSION_NUMBER @LIBVIRT_VERSION_NUMBER@
+# define LIBVIR_VERSION_NUMBER @LIBVIRT_VERSION_NUMBER@
 
 /**
  * LIBVIR_CHECK_VERSION:
@@ -85,25 +85,25 @@ extern "C" {
  *     // some code that only works in 1.1.3 and newer
  *   #endif
  */
-#define LIBVIR_CHECK_VERSION(major, minor, micro) \
+# define LIBVIR_CHECK_VERSION(major, minor, micro) \
     ((major) * 1000000 + (minor) * 1000 + (micro) <= LIBVIR_VERSION_NUMBER)
 
-#define __VIR_LIBVIRT_H_INCLUDES__
-#include <libvirt/libvirt-host.h>
-#include <libvirt/libvirt-domain.h>
-#include <libvirt/libvirt-domain-snapshot.h>
-#include <libvirt/libvirt-event.h>
-#include <libvirt/libvirt-interface.h>
-#include <libvirt/libvirt-network.h>
-#include <libvirt/libvirt-nodedev.h>
-#include <libvirt/libvirt-nwfilter.h>
-#include <libvirt/libvirt-secret.h>
-#include <libvirt/libvirt-storage.h>
-#include <libvirt/libvirt-stream.h>
-#undef __VIR_LIBVIRT_H_INCLUDES__
+# define __VIR_LIBVIRT_H_INCLUDES__
+# include <libvirt/libvirt-host.h>
+# include <libvirt/libvirt-domain.h>
+# include <libvirt/libvirt-domain-snapshot.h>
+# include <libvirt/libvirt-event.h>
+# include <libvirt/libvirt-interface.h>
+# include <libvirt/libvirt-network.h>
+# include <libvirt/libvirt-nodedev.h>
+# include <libvirt/libvirt-nwfilter.h>
+# include <libvirt/libvirt-secret.h>
+# include <libvirt/libvirt-storage.h>
+# include <libvirt/libvirt-stream.h>
+# undef __VIR_LIBVIRT_H_INCLUDES__
 
-#ifdef __cplusplus
+# ifdef __cplusplus
 }
-#endif
+# endif
 
 #endif /* __VIR_VIRLIB_H__ */
-- 
GitLab