View | Details | Raw Unified
Collapse All | Expand All

(-) wvstreams-3.70/src/ipstreams/wvaddr.cc (-1 / +1 lines)
 Lines 637-643    Link Here 
}
}
WvIPPortAddr::WvIPPortAddr(const unsigned char _ipaddr[4], __u16 _port)
WvIPPortAddr::WvIPPortAddr(const unsigned char *_ipaddr, __u16 _port)
			: WvIPAddr(_ipaddr)
			: WvIPAddr(_ipaddr)
{
{
    port = _port;
    port = _port;
(-) wvstreams-3.70/src/ipstreams/wvaddr.h (-1 / +1 lines)
 Lines 221-227    Link Here 
public:
public:
    unsigned char binaddr[4];
    unsigned char binaddr[4];
    WvIPAddr(const unsigned char _binaddr[4])
    WvIPAddr(const unsigned char *_binaddr)
        { if (_binaddr) memcpy(binaddr, _binaddr, 4); }
        { if (_binaddr) memcpy(binaddr, _binaddr, 4); }
    WvIPAddr(const __u32 _binaddr = 0)
    WvIPAddr(const __u32 _binaddr = 0)
        { memcpy(binaddr, &_binaddr, 4); }
        { memcpy(binaddr, &_binaddr, 4); }
(-) wvstreams-3.70/src/ipstreams/wvresolver.cc (-1 / +1 lines)
 Lines 128-134    Link Here 
// If addr==NULL, this just tests to see if the name exists.
// If addr==NULL, this just tests to see if the name exists.
int WvResolver::findaddr(int msec_timeout, const WvString &name,
int WvResolver::findaddr(int msec_timeout, const WvString &name,
			 WvIPAddr const **addr,
			 WvIPAddr const **addr,
                         WvIPAddrList *addrlist = NULL)
                         WvIPAddrList *addrlist)
{
{
    WvResolverHost *host;
    WvResolverHost *host;
    time_t now = time(NULL);
    time_t now = time(NULL);
(-) wvstreams-3.70/wvrules.mk (-3 / +3 lines)
 Lines 245-260    Link Here 
	ranlib $@
	ranlib $@
	
	
%.so:
%.so:
	@echo $(CC) $(LDFLAGS) $($@-LDFLAGS) -shared -o $@ $^ $($@-LIBS) $(LIBS) $(XX_LIBS)
	@echo $(CXX) $(LDFLAGS) $($@-LDFLAGS) -shared -o $@ $^ $($@-LIBS) $(LIBS) $(XX_LIBS)
	@set -e; \
	@set -e; \
	$(define_libexpand); \
	$(define_libexpand); \
	$(CC) $(LDFLAGS) $($@-LDFLAGS) -shared -o $@ \
	$(CXX) $(LDFLAGS) $($@-LDFLAGS) -shared -o $@ \
		$(filter %.o %.a %.so,$^) \
		$(filter %.o %.a %.so,$^) \
		$$(libexpand . $(filter %.libs,$^)) \
		$$(libexpand . $(filter %.libs,$^)) \
		$($@-LIBS) $(LIBS) $(XX_LIBS)
		$($@-LIBS) $(LIBS) $(XX_LIBS)
%: %.o
%: %.o
	$(CC) $(LDFLAGS) $($@-LDFLAGS) -o $@ $(filter %.o %.a %.so, $^) $($@-LIBS) $(LIBS) $(XX_LIBS)
	$(CXX) $(LDFLAGS) $($@-LDFLAGS) -o $@ $(filter %.o %.a %.so, $^) $($@-LIBS) $(LIBS) $(XX_LIBS)
# Force objects to be built before final binaries	
# Force objects to be built before final binaries	
$(addsuffix .o,$(basename $(wildcard *.c) $(wildcard *.cc) $(wildcard *.cpp))):
$(addsuffix .o,$(basename $(wildcard *.c) $(wildcard *.cc) $(wildcard *.cpp))):