The merge accidentally lost the C++ wrappers and os_types.h include in codec.h

Fixed

Monty

svn path=/trunk/vorbis/; revision=448

diff --git a/include/vorbis/codec.h b/include/vorbis/codec.h
index c2b12f167e7e2277644c780684664bf9b3110826..b18abfbfddae5596b53b2ae06ec9fc1f696e5ee9 100644 (file)
--- a/include/vorbis/codec.h
+++ b/include/vorbis/codec.h
@@ -12,16 +12,22 @@
  ********************************************************************
 
  function: libvorbis codec headers
- last mod: $Id: codec.h,v 1.17 2000/06/14 10:13:35 xiphmont Exp $
+ last mod: $Id: codec.h,v 1.18 2000/06/14 22:41:53 xiphmont Exp $
 
  ********************************************************************/
 
 #ifndef _vorbis_codec_h_
 #define _vorbis_codec_h_
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
 #define MAX_BARK 27
 
 #include <sys/types.h>
+#include "os_types.h"
 #include "vorbis/codebook.h"
 #include "vorbis/internal.h"
 
@@ -425,5 +431,9 @@ extern int      vorbis_synthesis_blockin(vorbis_dsp_state *v,vorbis_block *vb);
 extern int      vorbis_synthesis_pcmout(vorbis_dsp_state *v,double ***pcm);
 extern int      vorbis_synthesis_read(vorbis_dsp_state *v,int samples);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif