[Julius-cvs 438] CVS update: julius4/libjulius/include/julius

アーカイブの一覧に戻る

sumom****@users***** sumom****@users*****
2009年 9月 18日 (金) 17:31:08 JST


Index: julius4/libjulius/include/julius/extern.h
diff -u julius4/libjulius/include/julius/extern.h:1.15 julius4/libjulius/include/julius/extern.h:1.16
--- julius4/libjulius/include/julius/extern.h:1.15	Sat Jul  4 23:11:42 2009
+++ julius4/libjulius/include/julius/extern.h	Fri Sep 18 17:31:08 2009
@@ -12,7 +12,7 @@
  * @author Akinobu LEE
  * @date   Mon Mar  7 23:19:14 2005
  *
- * $Revision: 1.15 $
+ * $Revision: 1.16 $
  * 
  */
 /*
@@ -24,6 +24,10 @@
 
 /* should be included after all include files */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* backtrellis.c */
 void bt_init(BACKTRELLIS *bt);
 void bt_prepare(BACKTRELLIS *bt);
@@ -321,3 +325,7 @@
 boolean mfc_module_end(MFCCCalc *mfcc);
 int mfc_module_read(MFCCCalc *mfcc, int *new_t);
 char *mfc_module_input_name(MFCCCalc *mfcc);
+
+#ifdef __cplusplus
+}
+#endif
Index: julius4/libjulius/include/julius/jfunc.h
diff -u julius4/libjulius/include/julius/jfunc.h:1.6 julius4/libjulius/include/julius/jfunc.h:1.7
--- julius4/libjulius/include/julius/jfunc.h:1.6	Wed Mar 18 16:05:30 2009
+++ julius4/libjulius/include/julius/jfunc.h	Fri Sep 18 17:31:08 2009
@@ -12,7 +12,7 @@
  * @author Akinobu Lee
  * @date   Tue Nov  6 22:41:00 2007
  * 
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
  * 
  */
 /*
@@ -28,6 +28,10 @@
 #ifndef __J_JFUNC_H__
 #define __J_JFUNC_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* recogmain.c */
 int j_open_stream(Recog *recog, char *file_or_dev_name);
 int j_close_stream(Recog *recog);
@@ -104,4 +108,8 @@
 Recog *j_recog_new();
 void j_recog_free(Recog *recog);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __J_JFUNC_H__ */
Index: julius4/libjulius/include/julius/julius.h
diff -u julius4/libjulius/include/julius/julius.h:1.3 julius4/libjulius/include/julius/julius.h:1.4
--- julius4/libjulius/include/julius/julius.h:1.3	Thu Sep 25 14:00:05 2008
+++ julius4/libjulius/include/julius/julius.h	Fri Sep 18 17:31:08 2009
@@ -12,7 +12,7 @@
  * @author Akinobu LEE
  * @date   Thu Mar 17 21:08:21 2005
  *
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
  * 
  */
 /*
@@ -35,12 +35,13 @@
 # ifdef BUILD_JULIAN
 # include <julius/config-win-julian.h>
 # else
-# include <julius/config-win-julius.h>
+# include <julius/config-msvc-libjulius.h>
+# include <julius/config-msvc-libsent.h>
 # endif
 #else
 #include <julius/config.h>
-#endif
 #include <sent/config.h>
+#endif
 /* read built-in definitions */
 #include <julius/define.h>
 



Julius-cvs メーリングリストの案内
アーカイブの一覧に戻る