[xiph-commits] r15962 - trunk/vorbis/include/vorbis

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2009-04-27 15:12:58 -0700 (Mon, 27 Apr 2009)
New Revision: 15962

Modified:
   trunk/vorbis/include/vorbis/vorbisfile.h
Log:
wrapped vorbisfile.h static callbacks in #ifndef 
OV_EXCLUDE_STATIC_CALLBACKS



Modified: trunk/vorbis/include/vorbis/vorbisfile.h
===================================================================
--- trunk/vorbis/include/vorbis/vorbisfile.h	2009-04-27 21:45:44 UTC (rev 15961)
+++ trunk/vorbis/include/vorbis/vorbisfile.h	2009-04-27 22:12:58 UTC (rev 15962)
@@ -63,12 +63,15 @@
 /* These structs below (OV_CALLBACKS_DEFAULT etc) are defined here as
  * static data. That means that every file which includes this header
  * will get its own copy of these structs whether it uses them or
- * not. This is essential on platforms such as Windows on which
- * several different versions of stdio support may be linked to by
- * different DLLs, and we need to be certain we know which one we're
- * using (the same one as the main application).
+ * not unless it #defines OV_EXCLUDE_STATIC_CALLBACKS.
+ * These static symbols are essential on platforms such as Windows on
+ * which several different versions of stdio support may be linked to
+ * by different DLLs, and we need to be certain we know which one
+ * we're using (the same one as the main application).
  */
 
+#ifndef OV_EXCLUDE_STATIC_CALLBACKS
+
 static ov_callbacks OV_CALLBACKS_DEFAULT = {
   (size_t (*)(void *, size_t, size_t, void *))  fread,
   (int (*)(void *, ogg_int64_t, int))           _ov_header_fseek_wrap,
@@ -97,6 +100,8 @@
   (long (*)(void *))                            NULL
 };
 
+#endif
+
 #define  NOTOPEN   0
 #define  PARTOPEN  1
 #define  OPENED    2