NCL-6.5.0_fix-types.patch 2.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394
  1. fix compilation problems due to incorrect type
  2. author: Kenneth Hoste (HPC-UGent)
  3. --- ni/src/lib/nfp/SCRIP2KMLW.c.orig 2017-04-21 11:22:11.523861897 +0200
  4. +++ ni/src/lib/nfp/SCRIP2KMLW.c 2017-04-21 11:22:17.773923222 +0200
  5. @@ -8,17 +8,17 @@
  6. NhlErrorTypes SCRIP2KML_W(void) {
  7. /* Defining the Arguments */
  8. /* Argument # 0 */
  9. - string * scrip_filename;
  10. + NclQuark* scrip_filename;
  11. char * c_scrip_filename;
  12. int ncid;
  13. /* Argument # 1 */
  14. - string * kml_filename;
  15. + NclQuark* kml_filename;
  16. char * c_kml_filename;
  17. FILE * fid;
  18. /* Argument # 2 */
  19. - string * gridname;
  20. + NclQuark* gridname;
  21. char * c_gridname;
  22. /* End of Defining the Arguments */
  23. @@ -48,7 +48,7 @@
  24. /* Getting Arguments values */
  25. /* Argument # 0 */
  26. - scrip_filename = (string *) NclGetArgValue(
  27. + scrip_filename = (NclQuark*) NclGetArgValue(
  28. 0,
  29. 3,
  30. NULL,
  31. @@ -61,7 +61,7 @@
  32. c_scrip_filename = NrmQuarkToString(*scrip_filename);
  33. /* Argument # 1 */
  34. - kml_filename = (string *) NclGetArgValue(
  35. + kml_filename = (NclQuark*) NclGetArgValue(
  36. 1,
  37. 3,
  38. NULL,
  39. @@ -74,7 +74,7 @@
  40. c_kml_filename = NrmQuarkToString(*kml_filename);
  41. /* Argument # 1 */
  42. - gridname = (string *) NclGetArgValue(
  43. + gridname = (NclQuark*) NclGetArgValue(
  44. 2,
  45. 3,
  46. NULL,
  47. @@ -212,4 +212,4 @@
  48. free(grid_corner_lon);
  49. fclose(fid);
  50. return (NhlNOERROR);
  51. -}
  52. \ No newline at end of file
  53. +}
  54. --- ni/src/lib/nfp/Unstruct2KMLW.c.orig 2017-04-21 11:20:50.403067496 +0200
  55. +++ ni/src/lib/nfp/Unstruct2KMLW.c 2017-04-21 11:21:34.883504667 +0200
  56. @@ -7,12 +7,12 @@
  57. NhlErrorTypes Unstruct2KML_W(void) {
  58. /* Defining the Arguments */
  59. /* Argument # 0 */
  60. - string * filename;
  61. + NclQuark* filename;
  62. char * c_filename;
  63. FILE * fid;
  64. /* Argument # 1 */
  65. - string * gridname;
  66. + NclQuark* gridname;
  67. char * c_gridname;
  68. /* Argument # 2 */
  69. @@ -50,7 +50,7 @@
  70. /* Getting Arguments values */
  71. /* Argument # 0 */
  72. - filename = (string *) NclGetArgValue(
  73. + filename = (NclQuark*) NclGetArgValue(
  74. 0,
  75. 6,
  76. NULL,
  77. @@ -63,7 +63,7 @@
  78. c_filename = NrmQuarkToString(*filename);
  79. /* Argument # 1 */
  80. - gridname = (string *) NclGetArgValue(
  81. + gridname = (NclQuark*) NclGetArgValue(
  82. 1,
  83. 6,
  84. NULL,