Deleted Added
full compact
24,33c24,33
< * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
< * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
< * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
< * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
< * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
< * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
< * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
< * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
< * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
< * POSSIBILITY OF SUCH DAMAGE.
---
> * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
> * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
> * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
> * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
> * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
> * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
> * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
> * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
43a44,47
> #ifdef HAVE_TIME_H
> #include <time.h>
> #endif
> #include <sys/time.h>
74c78
< *base->time_secs = (uint32_t)base->time_tv->tv_sec;
---
> *base->time_secs = (time_t)base->time_tv->tv_sec;
111c115
< void *event_init(uint32_t* time_secs, struct timeval* time_tv)
---
> void *event_init(time_t* time_secs, struct timeval* time_tv)
184,185c188,189
< verbose(VERB_CLIENT, "winsock_event wait=%d.%6.6d",
< (int)wait->tv_sec, (int)wait->tv_usec);
---
> verbose(VERB_CLIENT, "winsock_event wait=" ARG_LL "d.%6.6d",
> (long long)wait->tv_sec, (int)wait->tv_usec);
491c495
< verbose(VERB_ALGO, "event_add %p added=%d fd=%d tv=%d %s%s%s",
---
> verbose(VERB_ALGO, "event_add %p added=%d fd=%d tv=" ARG_LL "d %s%s%s",
493c497
< (tv?(int)tv->tv_sec*1000+(int)tv->tv_usec/1000:-1),
---
> (tv?(long long)tv->tv_sec*1000+(long long)tv->tv_usec/1000:-1),
572c576
< verbose(VERB_ALGO, "event_del %p added=%d fd=%d tv=%d %s%s%s",
---
> verbose(VERB_ALGO, "event_del %p added=%d fd=%d tv=" ARG_LL "d %s%s%s",
574,575c578,579
< (ev->ev_events&EV_TIMEOUT)?(int)ev->ev_timeout.tv_sec*1000+
< (int)ev->ev_timeout.tv_usec/1000:-1,
---
> (ev->ev_events&EV_TIMEOUT)?(long long)ev->ev_timeout.tv_sec*1000+
> (long long)ev->ev_timeout.tv_usec/1000:-1,