Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -ruN zvbi/src/conv.c zvbi.new/src/conv.c
- --- src/conv.c 2008-02-26 15:39:23.000000000 +0100
- +++ src/conv.c 2008-09-11 21:05:18.000000000 +0200
- @@ -26,7 +26,9 @@
- #endif
- #include <errno.h>
- +#ifndef _WIN32
- #include <langinfo.h>
- +#endif
- #include "misc.h"
- #include "conv.h"
- @@ -1234,9 +1236,12 @@
- const char *dst_format;
- dst_format = bind_textdomain_codeset (vbi_intl_domainname, NULL);
- -
- +#ifdef _WIN32
- +#warning this is wrong
- +#else
- if (NULL == dst_format)
- dst_format = nl_langinfo (CODESET);
- +#endif
- return dst_format; /* may be NULL */
- }
- diff -ruN zvbi/src/export.c zvbi.new/src/export.c
- --- src/export.c 2008-02-19 01:35:15.000000000 +0100
- +++ src/export.c 2008-09-11 20:38:55.000000000 +0200
- @@ -40,6 +40,26 @@
- #include "conv.h"
- #include "vbi.h" /* asprintf */
- +#ifndef EOVERFLOW
- + #define EOVERFLOW 75
- +#endif
- +
- +#ifndef S_IRGRP
- +#define S_IRGRP 0
- +#endif
- +
- +#ifndef S_IWGRP
- +#define S_IWGRP 0
- +#endif
- +
- +#ifndef S_IROTH
- +#define S_IROTH 0
- +#endif
- +
- +#ifndef S_IWOTH
- +#define S_IWOTH 0
- +#endif
- +
- extern const char _zvbi_intl_domainname[];
- /**
- diff -ruN zvbi/src/packet.c zvbi.new/src/packet.c
- --- src/packet.c 2008-02-20 18:04:33.000000000 +0100
- +++ src/packet.c 2008-09-11 21:00:35.000000000 +0200
- @@ -32,7 +32,9 @@
- #include <fcntl.h>
- #include <time.h>
- #include <errno.h>
- +#ifndef _WIN32
- #include <sys/ioctl.h>
- +#endif
- #include "misc.h"
- #include "hamm.h"
- diff -ruN zvbi/src/proxy-msg.c zvbi.new/src/proxy-msg.c
- --- src/proxy-msg.c 2008-02-19 01:35:21.000000000 +0100
- +++ src/proxy-msg.c 2008-09-11 21:00:07.000000000 +0200
- @@ -129,7 +129,9 @@
- #include <netinet/tcp.h>
- #include <arpa/inet.h>
- #include <netdb.h>
- +#ifndef _WIN32
- #include <syslog.h>
- +#endif
- #include <assert.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
- diff -ruN zvbi/src/proxy-msg.h zvbi.new/src/proxy-msg.h
- --- src/proxy-msg.h 2008-02-19 01:35:21.000000000 +0100
- +++ src/proxy-msg.h 2008-09-11 20:59:40.000000000 +0200
- @@ -68,7 +68,9 @@
- #ifndef PROXY_MSG_H
- #define PROXY_MSG_H
- +#ifndef _WIN32
- #include <sys/syslog.h>
- +#endif
- /* Public */
- diff -ruN zvbi/src/vbi.c zvbi.new/src/vbi.c
- --- src/vbi.c 2008-03-05 14:33:04.000000000 +0100
- +++ src/vbi.c 2008-09-11 20:57:55.000000000 +0200
- @@ -39,7 +39,9 @@
- #include <fcntl.h>
- #include <time.h>
- #include <errno.h>
- +#ifndef _WIN32
- #include <sys/ioctl.h>
- +#endif
- #include <sys/time.h>
- #include <pthread.h>
- --- configure.in 2008-03-05 14:07:00.000000000 +0100
- +++ configure.in 2008-09-11 21:12:47.000000000 +0200
- @@ -164,14 +164,14 @@
- dnl Check how to link pthreads functions.
- dnl (-lpthread on Linux, -pthread on FreeBSD).
- dnl
- -AC_CHECK_LIB(pthread, pthread_create,,[
- - AC_TRY_LINK(, pthread_create();,,[
- - LDFLAGS="$LDFLAGS -pthread"
- - AC_TRY_LINK(, pthread_create();,,[
- - AC_MSG_ERROR([Unable to link pthread functions])
- - ])
- - ])
- -])
- +dnl AC_CHECK_LIB(pthread, pthread_create,,[
- +dnl AC_TRY_LINK(, pthread_create();,,[
- +dnl LDFLAGS="$LDFLAGS -pthread"
- +dnl AC_TRY_LINK(, pthread_create();,,[
- +dnl AC_MSG_ERROR([Unable to link pthread functions])
- +dnl ])
- +dnl ])
- +dnl ])
- dnl
- dnl Check for Gnome unicode library or libc 2.1.
- --- src/io.c 2008-02-19 01:35:20.000000000 +0100
- +++ src/io.c 2008-09-11 21:18:59.000000000 +0200
- @@ -28,8 +28,10 @@
- #include <fcntl.h> /* open() */
- #include <unistd.h> /* close(), mmap(), munmap(), gettimeofday() */
- +#ifndef _WIN32
- #include <sys/ioctl.h> /* ioctl() */
- #include <sys/mman.h> /* mmap(), munmap() */
- +#endif
- #include <sys/time.h> /* struct timeval */
- #include <sys/types.h>
- #include <errno.h>
- @@ -514,7 +516,7 @@
- }
- }
- -
- +#ifndef _WIN32
- /**
- * @internal
- *
- @@ -554,7 +556,7 @@
- return ret;
- }
- }
- -
- +#endif
- /* Helper functions to log the communication between the library and drivers.
- FIXME remove fp arg, call user log function instead (0.3). */
- @@ -668,7 +670,9 @@
- "EXCL", O_EXCL,
- "TRUNC", O_TRUNC,
- "APPEND", O_APPEND,
- +#ifndef _WIN32
- "NONBLOCK", O_NONBLOCK,
- +#endif
- 0);
- fprintf (fp, ", 0%o)", mode);
- @@ -773,6 +777,7 @@
- return err;
- }
- +#ifndef _WIN32
- /**
- * @internal
- * Drop-in for mmap(). Logs the request on fp if not NULL.
- @@ -822,7 +827,7 @@
- return r;
- }
- -
- +#endif
- /**
- * @internal
- * Drop-in for munmap(). Logs the request on fp if not NULL.
- --- zvbi-0.2.pc.in 2009-10-15 14:47:54.000000000 +0200
- +++ zvbi-0.2.pc.in 2009-10-15 14:47:46.000000000 +0200
- @@ -7,5 +7,5 @@
- Description: VBI Capturing and Decoding Library
- Requires:
- Version: @VERSION@
- -Libs: -L${libdir} -lzvbi -lm @LIBS@
- +Libs: -L${libdir} -lzvbi -lm -lpthread -lwsock32 @LIBS@
- Cflags: -I${includedir}
- --- src/packet-830.c 2013-07-10 11:37:18 +0000
- +++ src - Kopie/packet-830.c 2014-11-27 11:46:58 +0000
- @@ -30,6 +30,10 @@
- #include "hamm.h" /* vbi_rev16p(), vbi_iham8() */
- #include "packet-830.h"
- +#ifndef EOVERFLOW
- + #define EOVERFLOW 75
- +#endif
- +
- /**
- * @addtogroup Packet830 Teletext Packet 8/30 Decoder
- * @ingroup LowDec
- --- src/pdc.c 2009-03-23 01:30:34 +0000
- +++ src - Kopie/pdc.c 2014-11-27 11:47:38 +0000
- @@ -35,6 +35,10 @@
- #include "pdc.h"
- #include "conv.h"
- +#ifndef EOVERFLOW
- + #define EOVERFLOW 75
- +#endif
- +
- /**
- * @addtogroup ProgramID VPS/PDC Program ID
- * @ingroup LowDec
- --- Makefile - Kopie.am 2008-02-19 00:42:26 +0000
- +++ Makefile.am 2014-11-27 11:59:18 +0000
- @@ -21,9 +21,6 @@
- m4 \
- src \
- $(proxy_dirs) \
- - contrib \
- - examples \
- - test \
- po \
- doc
- --- Makefile - Kopie.in 2013-08-28 14:24:12 +0000
- +++ Makefile.in 2014-11-27 12:03:23 +0000
- @@ -78,7 +78,7 @@
- DATA = $(pkgconfig_DATA)
- ETAGS = etags
- CTAGS = ctags
- -DIST_SUBDIRS = m4 src daemon contrib examples test po doc
- +DIST_SUBDIRS = m4 src daemon po doc
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
- @@ -267,9 +267,6 @@
- m4 \
- src \
- $(proxy_dirs) \
- - contrib \
- - examples \
- - test \
- po \
- doc
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement