[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH] logging: Do not redefine mkostemp on uclibc



On Fri, Nov 02, 2012 at 12:18:32PM +0100, Martin Kletzander wrote:
> On 11/02/2012 12:15 PM, Jiri Denemark wrote:
> > An obsolete version of the patch that fixed building on systems with
> > uclibc (4dbd6e96) was accidentally pushed as part of the release commit
> > (2b435c15). Since this obsolete patch made syntax-check, commit 30b398d5
> > was pushed to fix that issue. But the real fix is to actually remove the
> > offending code.
> > 
> > This patch reverts commit 30b398d5 and the relevant part of 2b435c15.
> > ---
> >  cfg.mk             | 2 --
> >  src/util/logging.c | 5 -----
> >  2 files changed, 7 deletions(-)
> > 
> > diff --git a/cfg.mk b/cfg.mk
> > index 963f642..cda04e4 100644
> > --- a/cfg.mk
> > +++ b/cfg.mk
> > @@ -817,5 +817,3 @@ exclude_file_name_regexp--sc_unmarked_diagnostics = \
> >    ^(docs/apibuild.py|tests/virt-aa-helper-test)$$
> >  
> >  exclude_file_name_regexp--sc_size_of_brackets = cfg.mk
> > -
> > -exclude_file_name_regexp--sc_prohibit_mkstemp = ^src/util/logging\.c$$
> > diff --git a/src/util/logging.c b/src/util/logging.c
> > index 27bd74c..dd43842 100644
> > --- a/src/util/logging.c
> > +++ b/src/util/logging.c
> > @@ -58,11 +58,6 @@
> >  
> >  #define VIR_FROM_THIS VIR_FROM_NONE
> >  
> > -#ifdef __UCLIBC__
> > -/* uclibc does not implement mkostemp GNU extention */
> > -# define mkostemp(x,y) mkstemp(x)
> > -#endif
> > -
> >  VIR_ENUM_DECL(virLogSource)
> >  VIR_ENUM_IMPL(virLogSource, VIR_LOG_FROM_LAST,
> >                "file",
> > 
> 
> ACK, this is the desirable version.

  Ah, I actually removed the chunk I pushed by mistake in commit
bd0cb27cf6ceea4a388da99f0b7d8b0821446f93
so just the chunk about cfg.mk is needed now,

  sorry for the mess !

Daniel

-- 
Daniel Veillard      | Open Source and Standards, Red Hat
veillard redhat com  | libxml Gnome XML XSLT toolkit  http://xmlsoft.org/
http://veillard.com/ | virtualization library  http://libvirt.org/


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]