Xen devel - Aug 2013 - [PATCH] unmodified_drivers: change header string

_XEN_PLATFORM_PCI_H is already used by upstream
linux/xen/platform_pci.h. Adjust the string to avoid compile errors when
xen/platform_pci.h is included in platform-pci.c.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
 unmodified_drivers/linux-2.6/platform-pci/platform-pci.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h
b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h
index 2537213..5fd0e6a 100644
--- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h
+++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h
@@ -19,8 +19,8 @@
  * Place - Suite 330, Boston, MA 02111-1307 USA.
  */
 
-#ifndef _XEN_PLATFORM_PCI_H
-#define _XEN_PLATFORM_PCI_H
+#ifndef _UNMODIFIED_DRIVERS_XEN_PLATFORM_PCI_H
+#define _UNMODIFIED_DRIVERS_XEN_PLATFORM_PCI_H
 
 #include <linux/pci.h>
 
@@ -29,4 +29,4 @@ void platform_pci_resume(void);
 
 extern struct pci_dev *xen_platform_pdev;
 
-#endif /* _XEN_PLATFORM_PCI_H */
+#endif /* _UNMODIFIED_DRIVERS_XEN_PLATFORM_PCI_H */

>>> On 30.08.13 at 15:09, Olaf Hering <olaf@aepfle.de> wrote:
> --- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h
> +++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h
> @@ -19,8 +19,8 @@
>   * Place - Suite 330, Boston, MA 02111-1307 USA.
>   */
>  
> -#ifndef _XEN_PLATFORM_PCI_H
> -#define _XEN_PLATFORM_PCI_H
> +#ifndef _UNMODIFIED_DRIVERS_XEN_PLATFORM_PCI_H
> +#define _UNMODIFIED_DRIVERS_XEN_PLATFORM_PCI_H
This is not only ugly, but plain pointless: Private headers,
especially when not included from other headers (and hence
there''s no risk of multiple inclusion) don''t need such guards
at
all. Iow I''m not really willing to accept the above, but I
wouldn''t
mind a patch removing the guards.

Jan