Changeset b36a3b7


Ignore:
Timestamp:
10/25/04 21:07:20 (16 years ago)
Author:
Daniel Lawson <dlawson@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
Children:
24b42dd
Parents:
24412fc
Message:

poink

Location:
lib
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • lib/Makefile.am

    r4fd12ac rb36a3b7  
    11lib_LTLIBRARIES = libtrace.la
    22include_HEADERS = libtrace.h dagformat.h wag.h
    3 libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h
     3libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h dagapi.c dagopts.c
    44libtrace_la_CFLAGS = @ADD_INCLS@
    55libtrace_la_LIBADD = @ADD_LIBS@
  • lib/Makefile.in

    r4fd12ac rb36a3b7  
    8484lib_LTLIBRARIES = libtrace.la
    8585include_HEADERS = libtrace.h dagformat.h wag.h
    86 libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h
     86libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h dagapi.c dagopts.c
    8787libtrace_la_CFLAGS = @ADD_INCLS@
    8888libtrace_la_LIBADD = @ADD_LIBS@
     
    9595
    9696libtrace_la_DEPENDENCIES =
    97 am_libtrace_la_OBJECTS = libtrace_la-trace.lo libtrace_la-fifo.lo
     97am_libtrace_la_OBJECTS = libtrace_la-trace.lo libtrace_la-fifo.lo \
     98        libtrace_la-dagapi.lo libtrace_la-dagopts.lo
    9899libtrace_la_OBJECTS = $(am_libtrace_la_OBJECTS)
    99100
     
    104105LIBS = @LIBS@
    105106depcomp = $(SHELL) $(top_srcdir)/depcomp
    106 @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/libtrace_la-fifo.Plo \
     107@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/libtrace_la-dagapi.Plo \
     108@AMDEP_TRUE@    $(DEPDIR)/libtrace_la-dagopts.Plo \
     109@AMDEP_TRUE@    $(DEPDIR)/libtrace_la-fifo.Plo \
    107110@AMDEP_TRUE@    $(DEPDIR)/libtrace_la-trace.Plo
    108111COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
     
    161164libtrace_la-trace.lo: trace.c
    162165libtrace_la-fifo.lo: fifo.c
     166libtrace_la-dagapi.lo: dagapi.c
     167libtrace_la-dagopts.lo: dagopts.c
    163168libtrace.la: $(libtrace_la_OBJECTS) $(libtrace_la_DEPENDENCIES)
    164169        $(LINK) -rpath $(libdir) $(libtrace_la_LDFLAGS) $(libtrace_la_OBJECTS) $(libtrace_la_LIBADD) $(LIBS)
     
    170175        -rm -f *.tab.c
    171176
     177@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libtrace_la-dagapi.Plo@am__quote@
     178@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libtrace_la-dagopts.Plo@am__quote@
    172179@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libtrace_la-fifo.Plo@am__quote@
    173180@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libtrace_la-trace.Plo@am__quote@
     
    229236@AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    230237        $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtrace_la_CFLAGS) $(CFLAGS) -c -o libtrace_la-fifo.lo `test -f fifo.c || echo '$(srcdir)/'`fifo.c
     238
     239libtrace_la-dagapi.o: dagapi.c
     240@AMDEP_TRUE@    source='dagapi.c' object='libtrace_la-dagapi.o' libtool=no @AMDEPBACKSLASH@
     241@AMDEP_TRUE@    depfile='$(DEPDIR)/libtrace_la-dagapi.Po' tmpdepfile='$(DEPDIR)/libtrace_la-dagapi.TPo' @AMDEPBACKSLASH@
     242@AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     243        $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtrace_la_CFLAGS) $(CFLAGS) -c -o libtrace_la-dagapi.o `test -f dagapi.c || echo '$(srcdir)/'`dagapi.c
     244
     245libtrace_la-dagapi.obj: dagapi.c
     246@AMDEP_TRUE@    source='dagapi.c' object='libtrace_la-dagapi.obj' libtool=no @AMDEPBACKSLASH@
     247@AMDEP_TRUE@    depfile='$(DEPDIR)/libtrace_la-dagapi.Po' tmpdepfile='$(DEPDIR)/libtrace_la-dagapi.TPo' @AMDEPBACKSLASH@
     248@AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     249        $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtrace_la_CFLAGS) $(CFLAGS) -c -o libtrace_la-dagapi.obj `cygpath -w dagapi.c`
     250
     251libtrace_la-dagapi.lo: dagapi.c
     252@AMDEP_TRUE@    source='dagapi.c' object='libtrace_la-dagapi.lo' libtool=yes @AMDEPBACKSLASH@
     253@AMDEP_TRUE@    depfile='$(DEPDIR)/libtrace_la-dagapi.Plo' tmpdepfile='$(DEPDIR)/libtrace_la-dagapi.TPlo' @AMDEPBACKSLASH@
     254@AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     255        $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtrace_la_CFLAGS) $(CFLAGS) -c -o libtrace_la-dagapi.lo `test -f dagapi.c || echo '$(srcdir)/'`dagapi.c
     256
     257libtrace_la-dagopts.o: dagopts.c
     258@AMDEP_TRUE@    source='dagopts.c' object='libtrace_la-dagopts.o' libtool=no @AMDEPBACKSLASH@
     259@AMDEP_TRUE@    depfile='$(DEPDIR)/libtrace_la-dagopts.Po' tmpdepfile='$(DEPDIR)/libtrace_la-dagopts.TPo' @AMDEPBACKSLASH@
     260@AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     261        $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtrace_la_CFLAGS) $(CFLAGS) -c -o libtrace_la-dagopts.o `test -f dagopts.c || echo '$(srcdir)/'`dagopts.c
     262
     263libtrace_la-dagopts.obj: dagopts.c
     264@AMDEP_TRUE@    source='dagopts.c' object='libtrace_la-dagopts.obj' libtool=no @AMDEPBACKSLASH@
     265@AMDEP_TRUE@    depfile='$(DEPDIR)/libtrace_la-dagopts.Po' tmpdepfile='$(DEPDIR)/libtrace_la-dagopts.TPo' @AMDEPBACKSLASH@
     266@AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     267        $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtrace_la_CFLAGS) $(CFLAGS) -c -o libtrace_la-dagopts.obj `cygpath -w dagopts.c`
     268
     269libtrace_la-dagopts.lo: dagopts.c
     270@AMDEP_TRUE@    source='dagopts.c' object='libtrace_la-dagopts.lo' libtool=yes @AMDEPBACKSLASH@
     271@AMDEP_TRUE@    depfile='$(DEPDIR)/libtrace_la-dagopts.Plo' tmpdepfile='$(DEPDIR)/libtrace_la-dagopts.TPlo' @AMDEPBACKSLASH@
     272@AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     273        $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtrace_la_CFLAGS) $(CFLAGS) -c -o libtrace_la-dagopts.lo `test -f dagopts.c || echo '$(srcdir)/'`dagopts.c
    231274CCDEPMODE = @CCDEPMODE@
    232275uninstall-info-am:
  • lib/trace.c

    r4fd12ac rb36a3b7  
    479479                                                curr = 0;
    480480                                               
    481                                                 recptr = (dag_record_t *) (libtrace->buf + (bottom + curr));
     481                                                recptr = (dag_record_t *) ((void *)libtrace->buf + (bottom + curr));
    482482                                               
    483483                                                buffer=libtrace->buf + (bottom + curr);
Note: See TracChangeset for help on using the changeset viewer.