Pixie-2.2.6-strict.patch 2.6 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576
  1. diff -Naur Pixie.orig/src/ri/rib.l Pixie/src/ri/rib.l
  2. --- Pixie.orig/src/ri/rib.l 2008-11-12 02:00:24.000000000 -0500
  3. +++ Pixie/src/ri/rib.l 2012-07-25 21:01:07.357154937 -0400
  4. @@ -17,7 +17,7 @@
  5. // Overwrite the YYinput so that it uses libz
  6. #undef YY_INPUT
  7. -#define YY_INPUT(buf, retval, maxlen) if ( (retval = gzread(ribin,buf,maxlen)) < 0) \
  8. +#define YY_INPUT(buf, retval, maxlen) if ( (retval = gzread((gzFile) ribin,buf,maxlen)) < 0) \
  9. YY_FATAL_ERROR( "input in flex scanner failed" );
  10. #endif
  11. @@ -223,7 +223,7 @@
  12. TRibFile *nextFile = ribStack->next;
  13. rib_delete_buffer( YY_CURRENT_BUFFER );
  14. #ifdef HAVE_ZLIB
  15. - gzclose(ribin);
  16. + gzclose((gzFile) ribin);
  17. #else
  18. fclose(ribin);
  19. #endif
  20. @@ -243,7 +243,7 @@
  21. rib_delete_buffer( YY_CURRENT_BUFFER );
  22. #ifdef HAVE_ZLIB
  23. - gzclose(ribin);
  24. + gzclose((gzFile) ribin);
  25. #else
  26. fclose(ribin);
  27. #endif
  28. diff -Naur Pixie.orig/src/ri/rib.y Pixie/src/ri/rib.y
  29. --- Pixie.orig/src/ri/rib.y 2009-01-26 19:32:50.000000000 -0500
  30. +++ Pixie/src/ri/rib.y 2012-07-25 21:00:33.716950771 -0400
  31. @@ -2940,7 +2940,7 @@
  32. if (ribin != NULL) {
  33. #ifdef HAVE_ZLIB
  34. - gzclose(ribin);
  35. + gzclose((gzFile) ribin);
  36. #else
  37. fclose(ribin);
  38. #endif
  39. diff -Naur Pixie.orig/src/ri/ribOut.cpp Pixie/src/ri/ribOut.cpp
  40. --- Pixie.orig/src/ri/ribOut.cpp 2009-02-23 00:48:03.000000000 -0500
  41. +++ Pixie/src/ri/ribOut.cpp 2012-07-25 21:00:43.191008332 -0400
  42. @@ -162,7 +162,7 @@
  43. #ifdef HAVE_ZLIB
  44. if (outputCompressed) {
  45. - gzclose(outFile);
  46. + gzclose((gzFile) outFile);
  47. } else {
  48. fclose(outFile);
  49. }
  50. diff -Naur Pixie.orig/src/ri/ribOut.h Pixie/src/ri/ribOut.h
  51. --- Pixie.orig/src/ri/ribOut.h 2009-02-23 00:48:03.000000000 -0500
  52. +++ Pixie/src/ri/ribOut.h 2012-07-25 20:54:33.101761642 -0400
  53. @@ -237,7 +237,7 @@
  54. const int l = vsprintf(scratch,mes,args);
  55. #ifdef HAVE_ZLIB
  56. - if (outputCompressed) gzwrite(outFile,scratch,l);
  57. + if (outputCompressed) gzwrite((gzFile) outFile,scratch,l);
  58. else fwrite(scratch,1,l,outFile);
  59. #else
  60. fwrite(scratch,1,l,outFile);
  61. @@ -258,7 +258,7 @@
  62. const int l = vsprintf(scratch,mes,args);
  63. #ifdef HAVE_ZLIB
  64. - if (outputCompressed) gzwrite(outFile,scratch,l);
  65. + if (outputCompressed) gzwrite((gzFile) outFile,scratch,l);
  66. else fwrite(scratch,1,l,outFile);
  67. #else
  68. fwrite(scratch,1,l,outFile);