rtoss - Diff between revs 14 and 26

Subversion Repositories:
Rev:
Show entire file - Ignore whitespace
Rev 14 Rev 26
Line 1... Line 1...
1 /* 1 /*
2  * libmad - MPEG audio decoder library 2  * libmad - MPEG audio decoder library
3  * Copyright (C) 2000-2003 Underbit Technologies, Inc. -  
-   3  * Copyright (C) 2000-2004 Underbit Technologies, Inc.
4  * 4  *
5  * This program is free software; you can redistribute it and/or modify 5  * This program is free software; you can redistribute it and/or modify
6  * it under the terms of the GNU General Public License as published by 6  * it under the terms of the GNU General Public License as published by
7  * the Free Software Foundation; either version 2 of the License, or 7  * the Free Software Foundation; either version 2 of the License, or
8  * (at your option) any later version. 8  * (at your option) any later version.
Line 14... Line 14...
14  * 14  *
15  * You should have received a copy of the GNU General Public License 15  * You should have received a copy of the GNU General Public License
16  * along with this program; if not, write to the Free Software 16  * along with this program; if not, write to the Free Software
17  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 17  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18  * 18  *
19  * $Id: global.h,v 1.10 2003/06/05 02:27:07 rob Exp $ -  
-   19  * $Id: global.h,v 1.11 2004/01/23 09:41:32 rob Exp $
20  */ 20  */
21 21
22 # ifndef LIBMAD_GLOBAL_H 22 # ifndef LIBMAD_GLOBAL_H
23 # define LIBMAD_GLOBAL_H 23 # define LIBMAD_GLOBAL_H
24 24
Line 49... Line 49...
49 49
50 # if !defined(HAVE_ASSERT_H) 50 # if !defined(HAVE_ASSERT_H)
51 #  if defined(NDEBUG) 51 #  if defined(NDEBUG)
52 #   define assert(x)    /* nothing */ 52 #   define assert(x)    /* nothing */
53 #  else 53 #  else
54 #   define assert(x)    do { if (!(x)) abort(); } while (0) -  
-   54 //#   define assert(x)  do { if (!(x)) abort(); } while (0)
-   55 #   define assert(x)    /* nothing */
55 #  endif 56 #  endif
56 # endif 57 # endif
-   58
-   59 // add by Y.N
-   60 #ifdef _WIN32
-   61 #define inline __inline
-   62 #endif // _WIN32
57 63
58 # endif 64 # endif