From: Philippe E. <ph...@wa...> - 2002-12-05 04:55:05
Attachments:
patch.diff
|
I look deeper in that, after applying the following small patch the big difference are in opd_image.c, opd_image.h oprofiled.c and opd_stats.c/h. I think it's not worthwhile to try to share more things, it will just confuse the reader, so on merging can be do by: - opd_image.c/opd_image_25.c ditto for oprofiled.c and opd_image.h, select the right file in Makefile.am and conditionnaly if (with_kernel_support) AM_CPP_FLAGS = -DOPD_IMAGE_H=opd_image_25.h else AM_CPP_FLAGS = -DOPD_IMAGE_H=opd_image.h endif then #include OPD_IMAGE_H the only #ifdef #endif is trivial in op_stats.c to don't print the unused stats entry in the non- selected version. John, this look like the right approach ? regards, Phil |
From: John L. <le...@mo...> - 2002-12-06 02:10:21
|
On Thu, Dec 05, 2002 at 05:52:20AM +0000, Philippe Elie wrote: > I look deeper in that, after applying the following > small patch the big difference are in opd_image.c, > opd_image.h oprofiled.c and opd_stats.c/h. I think it's In other words, all the stuff most likely to change ... > - opd_image.c/opd_image_25.c ditto for oprofiled.c > and opd_image.h, select the right file in Makefile.am > and conditionnaly I don't think this is a great idea, it's just as confusing. > John, this look like the right approach ? I'm not convinced. However, stuff like the patch below are OK (resolving trivial differences) > diff -u -r1.18 opd_image.c > --- dae/opd_image.c 1 Dec 2002 06:17:35 -0000 1.18 > +++ dae/opd_image.c 5 Dec 2002 04:45:38 -0000 regards john |