From feacf7fa8788c911b241385e40c631362af50395 Mon Sep 17 00:00:00 2001 From: Guenter Bartsch Date: Sun, 20 Apr 2003 21:13:21 +0000 Subject: merging in win32 port CVS patchset: 4643 CVS date: 2003/04/20 21:13:21 --- src/xine-utils/compat.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/xine-utils/compat.h') diff --git a/src/xine-utils/compat.h b/src/xine-utils/compat.h index c18e8b442..a6592b030 100644 --- a/src/xine-utils/compat.h +++ b/src/xine-utils/compat.h @@ -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: compat.h,v 1.2 2001/12/14 21:03:03 f1rmb Exp $ + * $Id: compat.h,v 1.3 2003/04/20 21:13:26 guenter Exp $ * */ @@ -30,10 +30,12 @@ extern "C" { #endif -#ifndef __GNUC__ -#define __XINE_FUNCTION__ __func__ -#else +#if defined _MSC_VER +#define __XINE_FUNCTION__ __FILE__ +#elif defined __GNUC__ #define __XINE_FUNCTION__ __FUNCTION__ +#else +#define __XINE_FUNCTION__ __func__ #endif #ifndef NAME_MAX -- cgit v1.2.3