| Message ID | 1340640041-27358-1-git-send-email-rajagopal.venkat@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 6/25/2012 9:00 AM, Rajagopal Venkat wrote: <no commit message .. why? one sentence is cheap> > > diff --git a/src/lib.h b/src/lib.h > index 588c023..d354151 100644 > --- a/src/lib.h > +++ b/src/lib.h > @@ -30,6 +30,10 @@ > #endif > #include <stdint.h> > > +#if HAVE_CONFIG_H > +#include "config.h" > +#endif > + > #ifndef DISABLE_I18N > #define _(STRING) gettext(STRING) > #else > ok this chunk I do not understand; the rest of your patch looks very reasonable. why is config.h inside an if ?
On 25 June 2012 21:34, Arjan van de Ven <arjan@linux.intel.com> wrote: > On 6/25/2012 9:00 AM, Rajagopal Venkat wrote: > > <no commit message .. why? one sentence is cheap> > > Ok. Taken care. > > > > > diff --git a/src/lib.h b/src/lib.h > > index 588c023..d354151 100644 > > --- a/src/lib.h > > +++ b/src/lib.h > > @@ -30,6 +30,10 @@ > > #endif > > #include <stdint.h> > > > > +#if HAVE_CONFIG_H > > +#include "config.h" > > +#endif > > + > > #ifndef DISABLE_I18N > > #define _(STRING) gettext(STRING) > > #else > > > > > > ok this chunk I do not understand; > the rest of your patch looks very reasonable. > why is config.h inside an if ? > config.h is auto generated by autoconf and is not applicable for Android build. Yes. it should be wrapped in ifdef.
diff --git a/configure.ac b/configure.ac index 4da4eea..3cbc7b0 100644 --- a/configure.ac +++ b/configure.ac @@ -48,8 +48,9 @@ AC_CHECK_FUNCS([fdatasync getpagesize gettimeofday memmove memset mkdir munmap p AC_SEARCH_LIBS([delwin], [ncursesw ncurses], [], AC_MSG_ERROR([ncurses is required but was not found]), []) PKG_CHECK_MODULES([PCIUTILS], [libpci],[],[ - AC_SEARCH_LIBS([pci_get_dev], [pci], [], AC_MSG_ERROR([libpci is required but was not found]), []) -]) + AC_SEARCH_LIBS([pci_get_dev], [pci], [], AC_DEFINE([HAVE_NO_PCI],[1],[Define if pci is not supported]), []) +]) + PKG_CHECK_MODULES([LIBZ], [zlib],[],[ AC_SEARCH_LIBS([deflate], [z], [], AC_MSG_ERROR([zlib is required but was not found]), []) ]) diff --git a/src/lib.cpp b/src/lib.cpp index 0f87e48..77e49a2 100644 --- a/src/lib.cpp +++ b/src/lib.cpp @@ -35,11 +35,13 @@ #include <math.h> #include <stdlib.h> +#include "lib.h" + +#ifndef HAVE_NO_PCI extern "C" { #include <pci/pci.h> } - -#include "lib.h" +#endif #include <stdio.h> #include <stdint.h> @@ -266,6 +268,7 @@ void format_watts(double W, char *buffer, unsigned int len) } +#ifndef HAVE_NO_PCI static struct pci_access *pci_access; char *pci_id_to_name(uint16_t vendor, uint16_t device, char *buffer, int len) @@ -290,6 +293,19 @@ void end_pci_access(void) pci_free_name_list(pci_access); } +#else + +char *pci_id_to_name(uint16_t vendor, uint16_t device, char *buffer, int len) +{ + return NULL; +} + +void end_pci_access(void) +{ +} + +#endif /* HAVE_NO_PCI */ + int utf_ok = -1; diff --git a/src/lib.h b/src/lib.h index 588c023..d354151 100644 --- a/src/lib.h +++ b/src/lib.h @@ -30,6 +30,10 @@ #endif #include <stdint.h> +#if HAVE_CONFIG_H +#include "config.h" +#endif + #ifndef DISABLE_I18N #define _(STRING) gettext(STRING) #else
Signed-off-by: Rajagopal Venkat <rajagopal.venkat@linaro.org> --- configure.ac | 5 +++-- src/lib.cpp | 20 ++++++++++++++++++-- src/lib.h | 4 ++++ 3 files changed, 25 insertions(+), 4 deletions(-)