Author: diego Date: Sat Feb 2 13:07:08 2008 New Revision: 544 Log: Consistently use STANDALONE as preprocessor directive around main(). Modified: src/trunk/nututils/Makefile src/trunk/nututils/demux_avi.c src/trunk/nututils/demux_ogg.c Modified: src/trunk/nututils/Makefile ============================================================================== --- src/trunk/nututils/Makefile (original) +++ src/trunk/nututils/Makefile Sat Feb 2 13:07:08 2008 @@ -5,10 +5,10 @@ CFLAGS += -I../libnut -lm all: avireader nutmerge nutindex nutparse # oggreader avireader: demux_avi.c - $(CC) $(CFLAGS) -DAVI_PROG $^ -o $@ + $(CC) $(CFLAGS) -DSTANDALONE $^ -o $@ oggreader: demux_ogg.c - $(CC) $(CFLAGS) -DOGG_PROG $^ -o $@ + $(CC) $(CFLAGS) -DSTANDALONE $^ -o $@ nutmerge: demux_ogg.c demux_avi.c framer_vorbis.c framer_mp3.c framer_mpeg4.c nutmerge.c ../libnut/libnut.a # demux_nut.c $(CC) $(CFLAGS) $^ -o $@ Modified: src/trunk/nututils/demux_avi.c ============================================================================== --- src/trunk/nututils/demux_avi.c (original) +++ src/trunk/nututils/demux_avi.c Sat Feb 2 13:07:08 2008 @@ -472,7 +472,7 @@ demuxer_t avi_demuxer = { }; -#ifdef AVI_PROG +#ifdef STANDALONE void ready_stream(stream_t * streams){} void push_packet(stream_t * stream, packet_t * p){} void free_streams(stream_t * streams){} @@ -585,4 +585,4 @@ err_out: fclose(in); return err; } -#endif +#endif // STANDALONE Modified: src/trunk/nututils/demux_ogg.c ============================================================================== --- src/trunk/nututils/demux_ogg.c (original) +++ src/trunk/nututils/demux_ogg.c Sat Feb 2 13:07:08 2008 @@ -156,7 +156,7 @@ demuxer_t ogg_demuxer = { NULL }; -#ifdef OGG_PROG +#ifdef STANDALONE int main(int argc, char *argv[]) { FILE * in; demuxer_priv_t * ogg = NULL; @@ -196,4 +196,4 @@ int main(int argc, char *argv[]) { if (err == -1) err = 0; return err; } -#endif +#endif // STANDALONE