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.

102 lines
1.5 KiB

  1. --- a/fillbook.cc
  2. +++ b/fillbook.cc
  3. @@ -31,6 +31,9 @@
  4. #include "block.h"
  5. #include "mapbook.h"
  6. +#ifdef __UCLIBCXX_MAJOR__
  7. +#undef fputc
  8. +#endif
  9. // Return values: 1 write error, 0 OK.
  10. //
  11. --- a/genbook.cc
  12. +++ b/genbook.cc
  13. @@ -31,6 +31,9 @@
  14. #include "block.h"
  15. #include "mapbook.h"
  16. +#ifdef __UCLIBCXX_MAJOR__
  17. +#undef fputc
  18. +#endif
  19. const char * format_time( const long t, const bool low_prec )
  20. {
  21. --- a/loggers.cc
  22. +++ b/loggers.cc
  23. @@ -25,6 +25,9 @@
  24. #include "block.h"
  25. #include "loggers.h"
  26. +#ifdef __UCLIBCXX_MAJOR__
  27. +#undef fputc
  28. +#endif
  29. namespace {
  30. --- a/main.cc
  31. +++ b/main.cc
  32. @@ -46,6 +46,11 @@
  33. #include "non_posix.h"
  34. #include "rescuebook.h"
  35. +#ifdef __UCLIBCXX_MAJOR__
  36. +#undef fgetc
  37. +#undef fputc
  38. +#endif
  39. +
  40. #ifndef O_BINARY
  41. #define O_BINARY 0
  42. #endif
  43. --- a/main_common.cc
  44. +++ b/main_common.cc
  45. @@ -15,6 +15,10 @@
  46. along with this program. If not, see <http://www.gnu.org/licenses/>.
  47. */
  48. +#ifdef __UCLIBCXX_MAJOR__
  49. +#undef fputc
  50. +#endif
  51. +
  52. int verbosity = 0;
  53. namespace {
  54. --- a/mapbook.cc
  55. +++ b/mapbook.cc
  56. @@ -32,6 +32,10 @@
  57. #include "block.h"
  58. #include "mapbook.h"
  59. +#ifdef __UCLIBCXX_MAJOR__
  60. +#undef fgetc
  61. +#undef fputc
  62. +#endif
  63. namespace {
  64. --- a/mapfile.cc
  65. +++ b/mapfile.cc
  66. @@ -29,6 +29,11 @@
  67. #include "block.h"
  68. +#ifdef __UCLIBCXX_MAJOR__
  69. +#undef fgetc
  70. +#undef ferror
  71. +#undef feof
  72. +#endif
  73. namespace {
  74. --- a/rescuebook.cc
  75. +++ b/rescuebook.cc
  76. @@ -36,6 +36,9 @@
  77. #include "mapbook.h"
  78. #include "rescuebook.h"
  79. +#ifdef __UCLIBCXX_MAJOR__
  80. +#undef fputc
  81. +#endif
  82. namespace {