summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorJuergen Keil <jkeil@users.sourceforge.net>2001-09-06 18:38:11 +0000
committerJuergen Keil <jkeil@users.sourceforge.net>2001-09-06 18:38:11 +0000
commit94f33ff7e3b7140e78c014be1a68fe9c1ba17814 (patch)
tree56aacd13a3a2f5de4def305cceb2789cfa9bd807 /src/input
parent8d3fda905911b0b1cdadb33c00fb1f800e8f9320 (diff)
downloadxine-lib-94f33ff7e3b7140e78c014be1a68fe9c1ba17814.tar.gz
xine-lib-94f33ff7e3b7140e78c014be1a68fe9c1ba17814.tar.bz2
Trying to port the xine-lib sources to a non-gcc compiler
CVS patchset: 584 CVS date: 2001/09/06 18:38:11
Diffstat (limited to 'src/input')
-rw-r--r--src/input/Makefile.am5
-rw-r--r--src/input/dvd_udf.c4
-rw-r--r--src/input/input_file.c6
3 files changed, 11 insertions, 4 deletions
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index 12d21c62b..8d9546c01 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -2,8 +2,7 @@
## Process this file with automake to produce Makefile.in
##
-#CFLAGS += @GLOBAL_CFLAGS@
-CFLAGS = @CFLAGS@ -D_FILE_OFFSET_BITS=64 -Wall -DXINE_COMPILE
+CFLAGS = @GLOBAL_CFLAGS@
LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
@@ -71,7 +70,7 @@ uninstall-includeHEADERS:
debug:
- @$(MAKE) CFLAGS="-D_FILE_OFFSET_BITS=64 -Wall -DDEBUG -g -DXINE_COMPILE"
+ @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
install-debug: debug
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
diff --git a/src/input/dvd_udf.c b/src/input/dvd_udf.c
index c88209057..c8064b0eb 100644
--- a/src/input/dvd_udf.c
+++ b/src/input/dvd_udf.c
@@ -32,6 +32,10 @@
#include "dvd_udf.h"
+#ifndef __GNUC__
+#define __FUNCTION__ __func__
+#endif
+
static int _Unicodedecode (uint8_t *data, int len, char *target);
#define MAX_FILE_LEN 2048
diff --git a/src/input/input_file.c b/src/input/input_file.c
index 7763c42ff..0db3d1b33 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_file.c,v 1.20 2001/08/28 23:13:08 f1rmb Exp $
+ * $Id: input_file.c,v 1.21 2001/09/06 18:38:12 jkeil Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -43,6 +43,10 @@ extern int errno;
static uint32_t xine_debug;
+#ifndef __GNUC__
+#define __FUNCTION__ __func__
+#endif
+
#define MAXFILES 65535
#ifndef NAME_MAX