Re: [Gnash-dev] [PATCH] remove some server/ include files in libbase/

[strk]

Committed, thanks.
--strk;

On Sun, Sep 10, 2006 at 11:34:42PM +0200, Patrice Dumas wrote:
> Hello,
> 
> While trying to understand what happens with the missing symbol from 
> libbase, I tried to remove any include in libbase to files in server
> with the idea that the libbase header files shouldn't depend on the 
> server headers but that it should be the other way around.
> 
> I have found that the following references cannot be commented
> out without a build failure. I am pretty sure this is a bug, I guess
> this comes from the fact that this code is experimental and not used,
> and the error experienced in make check in libamf will certainly
> be fixed if it is fixed:
> 
> * network.h (in experimental code):
> #include "impl.h"
> * network.cpp (in experimental code):
> #include "fn_call.h"
> 
> I could comment out the remaining without any build error:
> 
> * network.h:
> #include "xml.h"
> * network.cpp:
> #include "xml.h"
> * log.cpp:
> #include "gnash.h"
> 
> I attach the patch that comment out those includes.
> 
> I think that once the remaining issues in experimental code in libbase 
> are fixed, the line
> 
>         -I$(top_srcdir)/server\
> 
> should be removed from libbase/Makefile.am.
> 
> --
> Pat

> Index: libbase/log.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/libbase/log.cpp,v
> retrieving revision 1.23
> diff -u -3 -p -r1.23 log.cpp
> --- libbase/log.cpp   27 Aug 2006 20:56:34 -0000      1.23
> +++ libbase/log.cpp   10 Sep 2006 21:12:23 -0000
> @@ -61,7 +61,7 @@
>  #endif
>  
>  #include "log.h"
> -#include "gnash.h"
> +//#include "gnash.h"
>  
>  #include <ctime>
>  
> Index: libbase/network.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/libbase/network.cpp,v
> retrieving revision 1.10
> diff -u -3 -p -r1.10 network.cpp
> --- libbase/network.cpp       30 Aug 2006 14:23:45 -0000      1.10
> +++ libbase/network.cpp       10 Sep 2006 21:12:23 -0000
> @@ -42,7 +42,7 @@
>  
>  #include "utility.h"
>  #include "log.h"
> -#include "xml.h"
> +//#include "xml.h"
>  #include "network.h"
>  #include "fn_call.h"
>  
> Index: libbase/network.h
> ===================================================================
> RCS file: /sources/gnash/gnash/libbase/network.h,v
> retrieving revision 1.5
> diff -u -3 -p -r1.5 network.h
> --- libbase/network.h 26 Aug 2006 18:20:51 -0000      1.5
> +++ libbase/network.h 10 Sep 2006 21:12:23 -0000
> @@ -55,7 +55,7 @@
>  # include <io.h>
>  #endif
>  
> -#include "xml.h"
> +//#include "xml.h"
>  #ifdef ENABLE_TESTING 
>  #include "impl.h"
>  #endif

> _______________________________________________
> Gnash-dev mailing list
> address@hidden
> http://lists.gnu.org/mailman/listinfo/gnash-dev


-- 

 /"\    ASCII Ribbon Campaign
 \ /    Respect for low technology.
  X     Keep e-mail messages readable by any computer system.
 / \    Keep it ASCII.