Attachment #91999 for bug #140786

Lines 31-36 Link Here

(-)./src/av-sh/Makefile.in.orig (-3 / +5 lines)
31	include $(top_builddir)/config/avango-defines	31	include $(top_builddir)/config/avango-defines
32	include $(top_builddir)/config/avango-rules	32	include $(top_builddir)/config/avango-rules
33		33
		34	NCURSES_LIBS= -lncurses
		35
34	CXXLOCALINCLUDE =-I$(srcdir) -I$(top_builddir)/include $(PERFORMER_INCLUDEDIR)	36	CXXLOCALINCLUDE =-I$(srcdir) -I$(top_builddir)/include $(PERFORMER_INCLUDEDIR)
35	LOCALDEFINES =-DAVANGO_VERSION=\"$(AVANGO_VERSION)\"	37	LOCALDEFINES =-DAVANGO_VERSION=\"$(AVANGO_VERSION)\"
36		38
Lines 98-109 Link Here
98		100
99	ifeq ($(LIB_VERSION_PREFIX),linux)	101	ifeq ($(LIB_VERSION_PREFIX),linux)
100		102
101	$(BINDIR)/av-daemon: PROGRAM_LIBS =-lfpIODevice $(LIBFP_LIBS) -lavthread	103	$(BINDIR)/av-daemon: PROGRAM_LIBS =-lfpIODevice $(LIBFP_LIBS) -lavthread $(NCURSES_LIBS)
102		104
103	ifeq ($(VIEWKIT_AVAILABLE),yes)	105	ifeq ($(VIEWKIT_AVAILABLE),yes)
104	$(BINDIR)/av-sh: PROGRAM_LIBS =$(VIEWKIT_LD_SEARCH_PATH) $(VIEWKIT_LIBS) -lfpRootService -lfpLightService $(LIBFP_LIBS)	106	$(BINDIR)/av-sh: PROGRAM_LIBS =$(VIEWKIT_LD_SEARCH_PATH) $(VIEWKIT_LIBS) -lfpRootService -lfpLightService $(LIBFP_LIBS) $(NCURSES_LIBS)
105	else	107	else
106	$(BINDIR)/av-sh: PROGRAM_LIBS =-lfpRootService -lfpLightService $(LIBFP_LIBS)	108	$(BINDIR)/av-sh: PROGRAM_LIBS =-lfpRootService -lfpLightService $(LIBFP_LIBS) $(NCURSES_LIBS)
107	endif	109	endif
108		110
109	endif	111	endif

Lines 31-38 Link Here

(-)./src/modules/io-drivers/misc/Makefile.in.orig (-2 / +2 lines)
31	include $(top_builddir)/config/avango-defines	31	include $(top_builddir)/config/avango-defines
32	include $(top_builddir)/config/avango-rules	32	include $(top_builddir)/config/avango-rules
33		33
34	CLOCALINCLUDE =-I$(srcdir) -I$(srcdir)/..	34	CLOCALINCLUDE =-I$(srcdir) -I$(srcdir)/.. -I$(top_builddir)/include
35	CXXLOCALINCLUDE =-I$(srcdir)	35	CXXLOCALINCLUDE =-I$(srcdir) -I$(top_builddir)/include
36	LOCALDEFINES =$(C_WOFFALL_FLAGS)	36	LOCALDEFINES =$(C_WOFFALL_FLAGS)
37		37
38	ifeq ($(LIB_VERSION_PREFIX),linux)	38	ifeq ($(LIB_VERSION_PREFIX),linux)

Lines 33-39 Link Here

(-)./src/modules/services/fpURLService.c++.orig (+2 lines)
33	#include "modules/services/fpURLService.h"	33	#include "modules/services/fpURLService.h"
34		34
35	#if !defined(AVANGO_NO_LIBWWW)	35	#if !defined(AVANGO_NO_LIBWWW)
		36	# if defined(HAVE_W3C_LIBWWW_WWWCONF_H)
36	# include <w3c-libwww/wwwconf.h>	37	# include <w3c-libwww/wwwconf.h>
		38	# endif
37	# include <w3c-libwww/wwwsys.h>	39	# include <w3c-libwww/wwwsys.h>
38	# include <w3c-libwww/WWWUtil.h>	40	# include <w3c-libwww/WWWUtil.h>
39	# include <w3c-libwww/WWWCore.h>	41	# include <w3c-libwww/WWWCore.h>

Lines 32-38 Link Here

(-)./src/loader/libpfdecompress/Makefile.in.orig (-1 / +1 lines)
32	include $(top_builddir)/config/avango-defines	32	include $(top_builddir)/config/avango-defines
33	include $(top_builddir)/config/avango-rules	33	include $(top_builddir)/config/avango-rules
34		34
35	CXXLOCALINCLUDE =-I$(srcdir) $(PERFORMER_INCLUDEDIR)	35	CXXLOCALINCLUDE =-I$(srcdir) $(PERFORMER_INCLUDEDIR) -I$(top_builddir)/include
36	LOCALDEFINES =-DAVANGO_VERSION=\"$(AVANGO_VERSION)\"	36	LOCALDEFINES =-DAVANGO_VERSION=\"$(AVANGO_VERSION)\"
37		37
38	HEADERS = \	38	HEADERS = \

Lines 33-39 Link Here

(-)./src/loader/libpfobj/Makefile.in.orig (-1 / +1 lines)
33	include $(top_builddir)/config/avango-rules	33	include $(top_builddir)/config/avango-rules
34		34
35	CLOCALINCLUDE =-I$(srcdir) $(PERFORMER_INCLUDEDIR)	35	CLOCALINCLUDE =-I$(srcdir) $(PERFORMER_INCLUDEDIR)
36	CXXLOCALINCLUDE =$(CLOCALINCLUDE)	36	CXXLOCALINCLUDE =$(CLOCALINCLUDE) -I$(top_builddir)/include
37	LOCALDEFINES =-DAVANGO_VERSION=\"$(AVANGO_VERSION)\"	37	LOCALDEFINES =-DAVANGO_VERSION=\"$(AVANGO_VERSION)\"
38		38
39	HEADERS = \	39	HEADERS = \

Lines 14-21 Link Here

(-)./src/ensemble/ensemble/util/printe.ml.orig (-2 / +2 lines)
14		14
15	(* $Id: printe.ml,v 1.1.1.1 2004/07/22 11:05:30 jogo_sf Exp $ *)	15	(* $Id: printe.ml,v 1.1.1.1 2004/07/22 11:05:30 jogo_sf Exp $ *)
16		16
17	external format_int: string -> int -> string = "format_int"	17	external format_int: string -> int -> string = "caml_format_int"
18	external format_float: string -> float -> string = "format_float"	18	external format_float: string -> float -> string = "caml_format_float"
19	(*	19	(*
20	let format_int f i = Printf.sprintf f i	20	let format_int f i = Printf.sprintf f i
21	let format_float f i = Printf.sprintf f i	21	let format_float f i = Printf.sprintf f i




/* End: from minor_gc.h */


extern value caml_gc_full_major(value v) ;

typedef struct {
  asize_t size;


value skt_heap(void) {
  unsigned int i ;

  caml_gc_full_major(Val_unit) ;
  
  /* Scan major heap.
   */

  return copy_string(addr_buf) ;
}

extern long caml_stat_minor_words ; /* gc_ctrl.c */

/* This code is extracted from gc_ctrl.c */
value skt_minor_words(void) {
  long ret ;
  ret = caml_stat_minor_words + Wsize_bsize (young_end - young_ptr) ;
  return Val_long(ret) ;
}  


Lines 2174-2179 Link Here

(-)./aclocal.m4.orig (+1 lines)
2174	w3c-libwww/WWWMIME.h \	2174	w3c-libwww/WWWMIME.h \
2175	w3c-libwww/WWWNews.h \	2175	w3c-libwww/WWWNews.h \
2176	w3c-libwww/WWWUtil.h \	2176	w3c-libwww/WWWUtil.h \
		2177	w3c-libwww/wwwconf.h \
2177	w3c-libwww/wwwsys.h,,	2178	w3c-libwww/wwwsys.h,,
2178	AC_MSG_ERROR([w3c-libwww headers incomplete.]),	2179	AC_MSG_ERROR([w3c-libwww headers incomplete.]),
2179	[	2180	[

Lines 9025-9030 Link Here

(-)./configure.orig (+1 lines)
9025	w3c-libwww/WWWMIME.h \	9025	w3c-libwww/WWWMIME.h \
9026	w3c-libwww/WWWNews.h \	9026	w3c-libwww/WWWNews.h \
9027	w3c-libwww/WWWUtil.h \	9027	w3c-libwww/WWWUtil.h \
		9028	w3c-libwww/wwwconf.h \
9028	w3c-libwww/wwwsys.h	9029	w3c-libwww/wwwsys.h
9029	do	9030	do
9030	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`	9031	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`

Lines 540-545 Link Here

(-)./config/config.h.in.orig (+3 lines)
540	/* Define to 1 if you have the <w3c-libwww/WWWCache.h> header file. */	540	/* Define to 1 if you have the <w3c-libwww/WWWCache.h> header file. */
541	#undef HAVE_W3C_LIBWWW_WWWCACHE_H	541	#undef HAVE_W3C_LIBWWW_WWWCACHE_H
542		542
		543	/* Define to 1 if you have the <w3c-libwww/wwwconf.h> header file. */
		544	#undef HAVE_W3C_LIBWWW_WWWCONF_H
		545
543	/* Define to 1 if you have the <w3c-libwww/WWWCore.h> header file. */	546	/* Define to 1 if you have the <w3c-libwww/WWWCore.h> header file. */
544	#undef HAVE_W3C_LIBWWW_WWWCORE_H	547	#undef HAVE_W3C_LIBWWW_WWWCORE_H
545		548

Return to bug 140786

Lines 11-17 Link Here

(-)./src/ensemble/ensemble/socket/s/heapc.c.orig (-4 / +5 lines)
11	/* End: from minor_gc.h */	11	/* End: from minor_gc.h */
12		12
13		13
14	extern value gc_full_major(value v) ;	14	extern value caml_gc_full_major(value v) ;
15		15
16	typedef struct {	16	typedef struct {
17	asize_t size;	17	asize_t size;
Lines 76-82 Link Here
76		76
77	value skt_heap(void) {	77	value skt_heap(void) {
78	unsigned int i ;	78	unsigned int i ;
79	gc_full_major(Val_unit) ;	79
		80	caml_gc_full_major(Val_unit) ;
80		81
81	/* Scan major heap.	82	/* Scan major heap.
82	*/	83	*/
Lines 146-157 Link Here
146	return copy_string(addr_buf) ;	147	return copy_string(addr_buf) ;
147	}	148	}
148		149
149	extern long stat_minor_words ; /* gc_ctrl.c */	150	extern long caml_stat_minor_words ; /* gc_ctrl.c */
150		151
151	/* This code is extracted from gc_ctrl.c */	152	/* This code is extracted from gc_ctrl.c */
152	value skt_minor_words(void) {	153	value skt_minor_words(void) {
153	long ret ;	154	long ret ;
154	ret = stat_minor_words + Wsize_bsize (young_end - young_ptr) ;	155	ret = caml_stat_minor_words + Wsize_bsize (young_end - young_ptr) ;
155	return Val_long(ret) ;	156	return Val_long(ret) ;
156	}	157	}
157		158