diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2003-04-20 21:13:21 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2003-04-20 21:13:21 +0000 |
| commit | feacf7fa8788c911b241385e40c631362af50395 (patch) | |
| tree | 20491c9acd09fc0240ba7e349dbebd343a7fafc4 /src/xine-utils/compat.h | |
| parent | 5031bfdd4c2a17d09804e99447d4f9cbae81a7b8 (diff) | |
| download | xine-lib-feacf7fa8788c911b241385e40c631362af50395.tar.gz xine-lib-feacf7fa8788c911b241385e40c631362af50395.tar.bz2 | |
merging in win32 port
CVS patchset: 4643
CVS date: 2003/04/20 21:13:21
Diffstat (limited to 'src/xine-utils/compat.h')
| -rw-r--r-- | src/xine-utils/compat.h | 10 |
1 files changed, 6 insertions, 4 deletions
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 |