Fix several minor bits of merge weirdness spotted by slothead.

git-svn-id: https://svn.xiph.org/trunk/Tremor@4570 0101bb08-14d6-0310-b084-bc0e0c8e3800

1 files changed, 0 insertions, 20 deletions

diff --git a/misc.h b/misc.h
index 2d45c00..49515f1 100644
--- a/misc.h
+++ b/misc.h
@@ -20,26 +20,6 @@
 #include "ivorbiscodec.h"
 #include "os_types.h"
 
-//#define _VDBG_GRAPHFILE "_0.m"
-extern void *_VDBG_malloc(void *ptr,long bytes,char *file,long line); 
-extern void _VDBG_free(void *ptr,char *file,long line); 
-
-#undef _ogg_malloc
-#undef _ogg_calloc
-#undef _ogg_realloc
-#undef _ogg_free
-
-#define _ogg_malloc(x) _VDBG_malloc(NULL,(x),__FILE__,__LINE__)
-#define _ogg_calloc(x,y) _VDBG_malloc(NULL,(x)*(y),__FILE__,__LINE__)
-#define _ogg_realloc(x,y) _VDBG_malloc((x),(y),__FILE__,__LINE__)
-#define _ogg_free(x) _VDBG_free((x),__FILE__,__LINE__)
-
-
-extern void *_vorbis_block_alloc(vorbis_block *vb,long bytes);
-extern void _vorbis_block_ripcord(vorbis_block *vb);
-extern void _analysis_output(char *base,int i,ogg_int32_t *v,int point,
-			     int n,int bark,int dB);
-
 #include "asm_arm.h"
   
 #ifndef _V_WIDE_MATH