1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

Fix build error on 4-stable. [*]

Move macro definitions from extra-patch-config.h.in to patch-src:xine-engine:xine_internal.h.

Submitted by:	glewis [*]
This commit is contained in:
MANTANI Nobutaka 2005-04-30 06:41:10 +00:00
parent 04dfdf255d
commit 4f5868bcf2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=134395
3 changed files with 38 additions and 25 deletions

View File

@ -52,11 +52,6 @@ MAN1= xine-config.1
.include <bsd.port.pre.mk>
# PRId64, INT16_MAX macro are not defined
.if ${OSVERSION} < 500040
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-config.h.in
.endif
# CDIOCREADAUDIO macro is not defined
.if ${OSVERSION} >= 501106
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src:input:input_cdda.c

View File

@ -1,17 +0,0 @@
--- config.h.in.orig Mon Jun 21 09:24:55 2004
+++ config.h.in Sun Jul 4 02:25:58 2004
@@ -561,3 +561,14 @@
/* Define to `unsigned' if <sys/types.h> does not define. */
#undef size_t
+
+#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || defined(__\
+sparc64__)
+#define PRId64 "ld"
+#else if defined(__i386__) || defined(__powerpc__)
+#define PRId64 "lld"
+#endif
+#define INT16_MAX 0x7fff
+#define INT16_MIN (-0x7fff-1)
+#define INT32_MAX 0x7fffffff
+#define INT32_MIN (-0x7fffffff-1)

View File

@ -1,6 +1,6 @@
--- src/xine-engine/xine_internal.h.orig Thu Dec 30 11:02:18 2004
+++ src/xine-engine/xine_internal.h Thu Dec 30 11:20:56 2004
@@ -70,6 +70,42 @@
--- src/xine-engine/xine_internal.h.orig Tue Apr 26 17:09:12 2005
+++ src/xine-engine/xine_internal.h Sat Apr 30 14:16:33 2005
@@ -70,6 +70,77 @@
# include <xine/info_helper.h>
#endif
@ -12,11 +12,39 @@
+#define INT8_MAX 0x7f
+#endif
+
+#ifndef INT16_MAX
+#define INT16_MAX 0x7fff
+#endif
+
+#ifndef INT16_MIN
+#define INT16_MIN (-0x7fff-1)
+#endif
+
+#ifndef INT32_MAX
+#define INT32_MAX 0x7fffffff
+#endif
+
+#ifndef INT32_MIN
+#define INT32_MIN (-0x7fffffff-1)
+#endif
+
+#ifndef PRIiMAX
+#define PRIiMAX "lld"
+typedef long long intmax_t;
+#endif
+
+#ifndef PRId64
+#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || defined(__sparc64__)
+#define PRId64 "ld"
+#else if defined(__i386__) || defined(__powerpc__)
+#define PRId64 "lld"
+#endif
+#endif
+
+#ifndef PRIdMAX
+#define PRIdMAX "lld"
+#endif
+
+#ifndef SCNdMAX
+#define SCNdMAX "lld"
+#endif
@ -37,9 +65,16 @@
+#define PRIXMAX "llX"
+#endif
+
+#ifndef PRIxMAX
+#define PRIxMAX "llx"
+#endif
+
+#ifndef UINT64_C
+#define UINT64_C(c) (c ## ULL)
+#endif
+
+
+
#define XINE_MAX_EVENT_LISTENERS 50
#define XINE_MAX_EVENT_TYPES 100