[virt-tools-list] [libosinfo v2 1/2] Add a private header

[Michal Privoznik]

On 30.10.2012 13:50, Zeeshan Ali (Khattak) wrote:
> From: "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org>
> 
> This is meant for including headers needed by many .c files.
> ---
>  osinfo/Makefile.am                   |  1 +
>  osinfo/osinfo_db.c                   |  4 +---
>  osinfo/osinfo_deployment.c           |  4 +---
>  osinfo/osinfo_deploymentlist.c       |  4 +---
>  osinfo/osinfo_device.c               |  4 +---
>  osinfo/osinfo_devicelink.c           |  4 +---
>  osinfo/osinfo_devicelinkfilter.c     |  4 +---
>  osinfo/osinfo_devicelinklist.c       |  4 +---
>  osinfo/osinfo_devicelist.c           |  4 +---
>  osinfo/osinfo_entity.c               |  4 +---
>  osinfo/osinfo_filter.c               |  4 +---
>  osinfo/osinfo_install_config.c       |  4 +---
>  osinfo/osinfo_install_config_param.c |  4 +---
>  osinfo/osinfo_install_script.c       |  4 +---
>  osinfo/osinfo_install_scriptlist.c   |  4 +---
>  osinfo/osinfo_list.c                 |  4 +---
>  osinfo/osinfo_loader.c               |  4 +---
>  osinfo/osinfo_media.c                |  4 +---
>  osinfo/osinfo_medialist.c            |  4 +---
>  osinfo/osinfo_os.c                   |  4 +---
>  osinfo/osinfo_oslist.c               |  4 +---
>  osinfo/osinfo_platform.c             |  4 +---
>  osinfo/osinfo_platformlist.c         |  4 +---
>  osinfo/osinfo_priv.h                 | 38 ++++++++++++++++++++++++++++++++++++
>  osinfo/osinfo_product.c              |  4 +---
>  osinfo/osinfo_productfilter.c        |  4 +---
>  osinfo/osinfo_productlist.c          |  4 +---
>  osinfo/osinfo_resources.c            |  4 +---
>  osinfo/osinfo_resourceslist.c        |  4 +---
>  osinfo/osinfo_tree.c                 |  4 +---
>  osinfo/osinfo_treelist.c             |  4 +---
>  31 files changed, 68 insertions(+), 87 deletions(-)
>  create mode 100644 osinfo/osinfo_priv.h
> 
> diff --git a/osinfo/Makefile.am b/osinfo/Makefile.am
> index 6ddb956..6461f1f 100644
> --- a/osinfo/Makefile.am
> +++ b/osinfo/Makefile.am
> @@ -111,6 +111,7 @@ libosinfo_1_0_la_SOURCES =	\
>    osinfo_treelist.c		\
>    osinfo_db.c			\
>    osinfo_loader.c		\
> +  osinfo_priv.h			\

Aaah. TABs, we meet again :)

>    $(NULL)
>  
>  if WITH_GOBJECT_INTROSPECTION
> diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
> index d2f0fa2..a2fc12d 100644
> --- a/osinfo/osinfo_db.c
> +++ b/osinfo/osinfo_db.c
> @@ -22,9 +22,7 @@
>   *   Daniel P. Berrange <berrange at redhat.com>
>   */
>  
> -#include <config.h>
> -
> -#include <osinfo/osinfo.h>
> +#include <osinfo/osinfo_priv.h>
>  #include <gio/gio.h>
>  #include <string.h>

I am afraid we can't move the include of config.h to osinfo_priv.h as it
makes syntax-check shout. Or we can then drop check for config.h.

Michal