[cvs] / xvidcore / src / portab.h Repository:
ViewVC logotype

Diff of /xvidcore/src/portab.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.46.2.6, Sat May 17 13:26:51 2003 UTC revision 1.51, Mon Apr 12 14:05:08 2004 UTC
# Line 4  Line 4 
4   *  - Portable macros, types and inlined assembly -   *  - Portable macros, types and inlined assembly -
5   *   *
6   *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>   *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>
7   *               2002 Peter Ross <pross@xvid.org>   *               2002-2003 Peter Ross <pross@xvid.org>
8   *               2002 Edouard Gomez <ed.gomez@free.fr>   *               2002-2003 Edouard Gomez <ed.gomez@free.fr>
9   *   *
10   *  This file is part of XviD, a free MPEG-4 video encoder/decoder   *  This program is free software ; you can redistribute it and/or modify
11   *   *  it under the terms of the GNU General Public License as published by
  *  XviD is free software; you can redistribute it and/or modify it  
  *  under the terms of the GNU General Public License as published by  
12   *  the Free Software Foundation; either version 2 of the License, or   *  the Free Software Foundation; either version 2 of the License, or
13   *  (at your option) any later version.   *  (at your option) any later version.
14   *   *
# Line 77  Line 75 
75  #    define CACHE_LINE 64  #    define CACHE_LINE 64
76  #    define ptr_t uint32_t  #    define ptr_t uint32_t
77  #    define intptr_t int32_t  #    define intptr_t int32_t
78  #    if _MSC_VER < 1300  #    if defined(_MSC_VER) && _MSC_VER >= 1300 && !defined(__INTEL_COMPILER)
 #        define uintptr_t uint32_t  
 #    else  
79  #        include <stdarg.h>  #        include <stdarg.h>
80    #    else
81    #        define uintptr_t uint32_t
82  #    endif  #    endif
83  #elif defined(ARCH_IS_64BIT)  #elif defined(ARCH_IS_64BIT)
84  #    define CACHE_LINE  64  #    define CACHE_LINE  64
85  #    define ptr_t uint64_t  #    define ptr_t uint64_t
86  #    define intptr_t int64_t  #    define intptr_t int64_t
87  #    if _MSC_VER < 1300  #    if defined (_MSC_VER) && _MSC_VER >= 1300 && !defined(__INTEL_COMPILER)
 #        define uintptr_t uint64_t  
 #    else  
88  #        include <stdarg.h>  #        include <stdarg.h>
89    #    else
90    #        define uintptr_t uint64_t
91  #    endif  #    endif
92  #else  #else
93  #    error You are trying to compile XviD without defining address bus size.  #    error You are trying to compile XviD without defining address bus size.
# Line 132  Line 130 
130              va_start(args, fmt);              va_start(args, fmt);
131              vsprintf(buf, fmt, args);              vsprintf(buf, fmt, args);
132              OutputDebugString(buf);              OutputDebugString(buf);
133              fprintf(stderr, "%s\n", buf);              fprintf(stderr, "%s", buf);
134           }           }
135       }       }
136  #    else  #    else
# Line 219  Line 217 
217              va_start(args, format);              va_start(args, format);
218              if(xvid_debug & level) {              if(xvid_debug & level) {
219                     vfprintf(stderr, format, args);                     vfprintf(stderr, format, args);
                    fprintf(stderr, "\n");  
220              }              }
221          }          }
222    
# Line 251  Line 248 
248   | gcc PPC and PPC Altivec specific macros/functions   | gcc PPC and PPC Altivec specific macros/functions
249   *---------------------------------------------------------------------------*/   *---------------------------------------------------------------------------*/
250  #    elif defined(ARCH_IS_PPC)  #    elif defined(ARCH_IS_PPC)
251    
252    #        if defined(HAVE_ALTIVEC_PARENTHESES_DECL)
253    #            define AVV(x...) (x)
254    #        elif defined(HAVE_ALTIVEC_BRACES_DECL)
255    #            define AVV(x...) {x}
256    #        else
257    #            error Trying to compile PPC target without a vector declaration type.
258    #        endif
259    
260  #        define BSWAP(a) __asm__ __volatile__ \  #        define BSWAP(a) __asm__ __volatile__ \
261                  ( "lwbrx %0,0,%1; eieio" : "=r" (a) : "r" (&(a)), "m" (a));                  ( "lwbrx %0,0,%1; eieio" : "=r" (a) : "r" (&(a)), "m" (a));
262    
# Line 335  Line 341 
341               char buf[DPRINTF_BUF_SZ];               char buf[DPRINTF_BUF_SZ];
342               va_start(args, fmt);               va_start(args, fmt);
343               vsprintf(buf, fmt, args);               vsprintf(buf, fmt, args);
344               fprintf(stderr, "%s\n", buf);               fprintf(stderr, "%s", buf);
345           }           }
346       }       }
347  #    else /* _DEBUG */  #    else /* _DEBUG */
# Line 412  Line 418 
418              va_start(args, format);              va_start(args, format);
419              if(xvid_debug & level) {              if(xvid_debug & level) {
420                     vfprintf(stderr, format, args);                     vfprintf(stderr, format, args);
                    fprintf(stderr, "\n");  
421              }              }
422          }          }
423    
Legend:
Removed from v.1.46.2.6  
changed lines
  Added in v.1.51
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4