[xine-cvs] CVS: xine-lib/src/xine-utils Makefile.am,1.43,1.44 xineutils.h,1.100,1.101

[Frantisek D. <va...@us...>]

Update of /cvsroot/xine/xine-lib/src/xine-utils
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14678/src/xine-utils

Modified Files:
	Makefile.am xineutils.h 
Log Message:
Ancient platforms support:
  - rint, lrint, M_PI (ffmpeg and goom)
  - avoid mkdir warnings
  - check for older _GUID_DEFINED too
  - ressurected generating inttypes, cleaned public os_types.h
  - moved function redefiniton used only in the old MSVC to central place

Windows port update:
  - build internal ffmpeg:
    - workaround 'near' keyword problem
  - proper using __declspec(dllimport)

Other changes:
  - LIBFFMPEG_CFLAGS --> LIBFFMPEG_CPPFLAGS


Index: Makefile.am
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-utils/Makefile.am,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- Makefile.am	28 Jan 2006 17:09:59 -0000	1.43
+++ Makefile.am	8 Apr 2006 16:42:38 -0000	1.44
@@ -12,6 +12,7 @@
 endif
 
 AM_CFLAGS = $(X_CFLAGS)
+AM_CPPFLAGS=-DXINE_LIBRARY_COMPILE
 
 libxineutils_la_SOURCES = $(pppc_files) \
 	cpu_accel.c \

Index: xineutils.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-utils/xineutils.h,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- xineutils.h	14 Feb 2006 19:12:16 -0000	1.100
+++ xineutils.h	8 Apr 2006 16:42:38 -0000	1.101
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2005 the xine project
+ * Copyright (C) 2000-2006 the xine project
  *
  * This file is part of xine, a free video player.
  *
@@ -65,9 +65,14 @@
 
 #include <stdio.h>
 #include <string.h>
-/* for alloca under MinGW */
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
+
+/* 
+ * Mark exported data symbols for link engine library clients with older
+ * Win32 compilers
+ */
+#if defined(WIN32) && !defined(XINE_LIBRARY_COMPILE)
+#  define DL_IMPORT __declspec(dllimport)
+#  define extern DL_IMPORT extern
 #endif
 
   /*
@@ -595,18 +600,7 @@
 
 		     /* Optimized/fast memcpy */
 
-/*
-   TODO : fix dll linkage problem for xine_fast_memcpy on win32
-
-   xine_fast_memcpy dll linkage is screwy here.
-   declaring as dllimport seems to fix the problem
-   but causes compiler warning with libxineutils
-*/
-#ifdef _MSC_VER
-__declspec( dllimport ) extern void *(* xine_fast_memcpy)(void *to, const void *from, size_t len);
-#else
 extern void *(* xine_fast_memcpy)(void *to, const void *from, size_t len);
-#endif
 
 #ifdef HAVE_XINE_INTERNAL_H
 /* Benchmark available memcpy methods */
@@ -978,6 +972,11 @@
  */
 int xine_monotonic_clock(struct timeval *tv, struct timezone *tz);      
 
+/* don't harm following code */
+#ifdef extern
+#  undef extern
+#endif
+
 #ifdef __cplusplus
 }
 #endif