mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

28 lines
1.1 KiB

  1. fixes errors like:
  2. siod_est.cc:55: error: 'obj' is not a template type
  3. diff -dur speech_tools/include/EST_Chunk.h src.festival.1134794422.18915.715897024/speech_tools/include/EST_Chunk.h
  4. --- speech_tools/include/EST_Chunk.h 2004-04-30 18:56:49.000000000 +0200
  5. +++ speech_tools/include/EST_Chunk.h 2005-12-18 20:21:19.000000000 +0100
  6. @@ -103,6 +103,8 @@
  7. /* */
  8. /************************************************************************/
  9. +class EST_ChunkPtr;
  10. +
  11. class EST_Chunk {
  12. public:
  13. typedef unsigned short use_counter;
  14. diff -dur speech_tools/include/siod_defs.h src.festival.1134794422.18915.715897024/speech_tools/include/siod_defs.h
  15. --- speech_tools/include/siod_defs.h 2004-05-29 20:34:40.000000000 +0200
  16. +++ speech_tools/include/siod_defs.h 2005-12-18 21:15:36.000000000 +0100
  17. @@ -87,7 +87,7 @@
  18. #define USERVAL(x) ((*x).storage_as.user.p)
  19. #define UNTYPEDVAL(x) ((*x).storage_as.user.p)
  20. -#define NIL ((struct obj *) 0)
  21. +#define NIL ((LISP) 0)
  22. #define EQ(x,y) ((x) == (y))
  23. #define NEQ(x,y) ((x) != (y))
  24. #define NULLP(x) EQ(x,NIL)