--- timer.h	2002/09/05 21:20:51	1.5
+++ timer.h	2003/06/09 13:55:53	1.9.2.1
@@ -1,51 +1,37 @@
 /*****************************************************************************
  *
  *  XVID MPEG-4 VIDEO CODEC
- *  - Simple profiling functions header file -
+ *  - Timer related header (used for internal debugging)  -
  *
- *  Copyright(C) 2002 Michael Militzer
+ *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>
  *
- *  This program is an implementation of a part of one or more MPEG-4
- *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending
- *  to use this software module in hardware or software products are
- *  advised that its use may infringe existing patents or copyrights, and
- *  any such use would be at such party's own risk.  The original
- *  developer of this software module and his/her company, and subsequent
- *  editors and their companies, will have no liability for use of this
- *  software or modifications or derivatives thereof.
- *
- *  This program is free software; you can redistribute it and/or modify
+ *  This program is free software ; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation ; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  but WITHOUT ANY WARRANTY ; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
+ *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: timer.h,v 1.5 2002/09/05 21:20:51 edgomez Exp $
+ * $Id: timer.h,v 1.9.2.1 2003/06/09 13:55:53 edgomez Exp $
  *
  ****************************************************************************/
 
-#ifndef _TIMER_H
-#define _TIMER_H
+#ifndef _ENCORE_TIMER_H
+#define _ENCORE_TIMER_H
 
-/*****************************************************************************
- * Prototypes
- ****************************************************************************/
-
-#ifdef _PROFILING_
+#if defined(_PROFILING_)
 
 #include "../portab.h"
 
 uint64_t count_frames;
 
-/* Here we declare external symbols defined in timer.h */
 extern void start_timer();
 extern void start_global_timer();
 extern void stop_dct_timer();
@@ -67,11 +53,6 @@
 
 #else
 
-/*
- * We define dummy inline functions, a good compiler should just
- *  remove the function call
- */
-
 static __inline void
 start_timer()
 {
@@ -145,6 +126,6 @@
 {
 }
 
-#endif /* _PROFILING_ */
+#endif
 
-#endif /* _TIMER_H_ */
+#endif							/* _TIMER_H_ */