Changeset 355


Ignore:
Timestamp:
Mar 23, 2006 6:04:15 PM (18 years ago)
Author:
bennylp
Message:

Fixed misc warnings/errors in Solaris build

Location:
pjproject/trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • pjproject/trunk/build/rules.mak

    r136 r355  
    154154        for F in $(FULL_SRCS); do \ 
    155155           if test -f $$F; then \ 
    156              echo -n "$(OBJDIR)/" >> $(DEP_FILE); \ 
     156             echo "$(OBJDIR)/" | tr -d '\n' >> $(DEP_FILE); \ 
    157157             if gcc -M $(DEPFLAGS) $$F | sed '/^#/d' >> $(DEP_FILE); then \ 
    158158                true; \ 

  • pjproject/trunk/configure

    r345 r355  
    99fi; 
    1010 
    11 if echo $MACHINE | grep sun4u > /dev/null; then 
     11if echo $MACHINE | grep sparc > /dev/null; then 
    1212    MACHINE_NAME=sparc 
    1313elif echo $MACHINE | grep i.86 > /dev/null; then 

  • pjproject/trunk/pjlib-util/build/Makefile

    r240 r355  
    7272        $(MAKE) -f $(RULES_MAK) APP=PJLIB_UTIL app=pjlib-util $@ 
    7373        $(MAKE) -f $(RULES_MAK) APP=UTIL_TEST app=pjlib-util-test $@ 
    74         @if test "$@" == "depend"; then \ 
     74        @if test "$@" = "depend"; then \ 
    7575          echo '$(TEST_EXE): $(PJLIB_UTIL_LIB)' >> .pjlib-util-test-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \ 
    7676        fi 

  • pjproject/trunk/pjmedia/build/Makefile

    r341 r355  
    161161        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $@ 
    162162        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@ 
    163         @if test "$@" == "depend"; then \ 
     163        @if test "$@" = "depend"; then \ 
    164164          echo '$(PJMEDIA_LIB): .pjmedia-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend' >> .pjmedia-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \ 
    165165          echo '$(PJMEDIA_CODEC_LIB): .pjmedia-codec-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend' >> .pjmedia-codec-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \ 

  • pjproject/trunk/pjmedia/build/os-win32.mak

    r320 r355  
    1414 
    1515# Example: 
    16 #  to activate Null sound, uncomment this line below. 
     16#  to activate Null sound, uncomment these two lines below. 
    1717#export SOUND_OBJS = $(NULLSOUND_OBJS) 
     18#export OS_CFLAGS += $(CC_DEF)PJMEDIA_HAS_NULL_SOUND 
    1819 
    1920# Example: 

  • pjproject/trunk/pjmedia/include/pjmedia.h

    r327 r355  
    3939#include <pjmedia/sdp.h> 
    4040#include <pjmedia/sdp_neg.h> 
     41#include <pjmedia/silencedet.h> 
    4142#include <pjmedia/session.h> 
    4243#include <pjmedia/sound.h> 

  • pjproject/trunk/pjmedia/include/pjmedia/silencedet.h

    r229 r355  
    131131 
    132132 
     133/** 
     134 * Declaration linear2ulaw 
     135 */ 
     136unsigned char linear2ulaw(int pcm_val); 
     137 
     138 
    133139PJ_END_DECL 
     140 
    134141 
    135142#endif  /* __PJMEDIA_SILENCE_DET_H__ */ 

  • pjproject/trunk/pjmedia/src/pjmedia/errno.c

    r334 r355  
    146146 
    147147    /* See if the error comes from PortAudio. */ 
     148#if defined(PJMEDIA_HAS_PORTAUDIO_SOUND) && PJMEDIA_HAS_PORTAUDIO_SOUND!=0 
    148149    if (statcode >= PJMEDIA_ERRNO_FROM_PORTAUDIO(paNotInitialized) && 
    149150        statcode <  PJMEDIA_ERRNO_FROM_PORTAUDIO(paNotInitialized + 10000)) 
    … …  
    160161        return errstr; 
    161162 
    162     } else if (statcode >= PJMEDIA_ERRNO_START &&  
     163    } else  
     164#endif  /* PJMEDIA_HAS_PORTAUDIO_SOUND */ 
     165    if (statcode >= PJMEDIA_ERRNO_START &&  
    163166               statcode < PJMEDIA_ERRNO_START + PJ_ERRNO_SPACE_SIZE) 
    164167    { 

  • pjproject/trunk/pjsip-apps/build/Makefile

    r342 r355  
    9393        $(MAKE) -f $(RULES_MAK) APP=PJSIPPERF app=pjsip-perf $@ 
    9494        $(MAKE) -f Samples.mak $@ 
    95         @if test "$@" == "depend"; then \ 
     95        @if test "$@" = "depend"; then \ 
    9696          echo '$(PJSUA_EXE): $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE) $(PJSUA_LIB_LIB) $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB) Makefile' >> .pjsua-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \ 
    9797          echo '$(PJSIPPERF_EXE): $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE) $(PJSUA_LIB_LIB) $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB)' >> .pjsip-perf-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \ 

  • pjproject/trunk/pjsip-apps/src/pjsua/main.c

    r324 r355  
    318318 
    319319    /* Left trim */ 
    320     while (isspace(*buf)) { 
     320    while (pj_isspace(*buf)) { 
    321321        ++buf; 
    322322        --len; 
    … …  
    330330        return; 
    331331 
    332     if (isdigit(*buf) || *buf=='-') { 
     332    if (pj_isdigit(*buf) || *buf=='-') { 
    333333         
    334334        int i; 
    … …  
    340340 
    341341        for (; i<len; ++i) { 
    342             if (!isdigit(buf[i])) { 
     342            if (!pj_isdigit(buf[i])) { 
    343343                puts("Invalid input"); 
    344344                return; 
Note: See TracChangeset for help on using the changeset viewer.