[ Thread Index |
Date Index
| More lists.liballeg.org/allegro-developers Archives
]
On Monday 06 October 2008, Peter Wang wrote:
> On 2008-10-06, Thomas Fjellstrom <tfjellstrom@xxxxxxxxxx> wrote:
> > On Monday 06 October 2008, Peter Wang wrote:
> > > On 2008-10-06, Thomas Fjellstrom <tfjellstrom@xxxxxxxxxx> wrote:
> > > > Attached is the (large) diff I generated using 'svn diff', let me
> > > > know if theres any problems. Or if its ok for me to merge fshook into
> > > > 4.9. If its ok, the fshook history is a bit of a mess, so I suppose
> > > > it doesn't matter if we merge, or just apply the patch.
> > >
> > > Thanks for that.
> > >
> > > It looks *mostly* okay (only really skimmed it at this point).
> > > Some minor things but we can fix those afterwards.
> > >
> > > But, there are some changes that shouldn't be there, e.g. in
> > > CMakeLists.txt,
> > > readme_a5.txt,
> > > addons/kcm_audio/CMakeLists.txt,
> > > addons/acodec/CMakeLists.txt
> > >
> > > I'm not sure the FSHOOK-TODO should be there either.
> >
> > Yeah, if I apply I'll weed out stuff like FSHOOK-TODO. I'll look at the
> > others, but I think some CMakeList changes are needed, which specifically
> > are you against?
> >
[snip]
>
> > Index: src/unix/usystem.c
> > ===================================================================
> > --- src/unix/usystem.c (.../4.9) (revision 11023)
> > +++ src/unix/usystem.c (.../4.9-fshook) (revision 11023)
> > @@ -21,12 +21,14 @@
> > #include <stdlib.h>
> > #include <string.h>
> > #include <sys/stat.h>
> > +#include <sys/types.h>
> > +#include <pwd.h>
>
> Might as well wrap with ALLEGRO_HAVE_SYS_TYPES_H
>
Do you mind if I just remove that sys/types.h include? the fshook.h include
lower down pulls it in, and typedef's off_t if it wasn't seen. I don't really
want to put that code in two places, since it'll conflict.
--
Thomas Fjellstrom
tfjellstrom@xxxxxxxxxx