Remove obsolete and incorrect CMake unsigned long mangling of yacc output

It is (no longer?) necessary and it was anyway incorrect in that it
converted unsigned long to uint_64_t which doesn't exist.

Fixes https://gitlab.com/graphviz/graphviz/-/issues/1796

diff --git a/cmake/modify_cgraph_grammar.cmake.in b/cmake/modify_cgraph_grammar.cmake.in
index 772fe145c781860f66c2a2f1c84e1874f8358a2e..231b5e938f2a38bd44fe0c5f29076d2f26d06717 100644 (file)
--- a/cmake/modify_cgraph_grammar.cmake.in
+++ b/cmake/modify_cgraph_grammar.cmake.in
@@ -1,11 +1,7 @@
 file(READ @CMAKE_CURRENT_BINARY_DIR@/grammar.h file_contents)
 string(REPLACE "yy" "aag" file_contents "${file_contents}")
-string(REPLACE "unsigned long int" "uint_64_t" file_contents "${file_contents}")
-string(REPLACE "unsigned long" "uint_64_t" file_contents "${file_contents}")
 file(WRITE @CMAKE_CURRENT_BINARY_DIR@/grammar.h "${file_contents}")
 
 file(READ @CMAKE_CURRENT_BINARY_DIR@/grammar.c file_contents)
 string(REPLACE "yy" "aag" file_contents "${file_contents}")
-string(REPLACE "unsigned long int" "uint_64_t" file_contents "${file_contents}")
-string(REPLACE "unsigned long" "uint_64_t" file_contents "${file_contents}")
 file(WRITE @CMAKE_CURRENT_BINARY_DIR@/grammar.c "${file_contents}")

diff --git a/cmake/modify_common_htmlparse.cmake.in b/cmake/modify_common_htmlparse.cmake.in
index 5e42fcc4ee8a48240d334313b230cc43dcfdf030..908b080b009da60ac80315f25eec06944b5ae390 100644 (file)
--- a/cmake/modify_common_htmlparse.cmake.in
+++ b/cmake/modify_common_htmlparse.cmake.in
@@ -1,11 +1,7 @@
 file(READ @CMAKE_CURRENT_BINARY_DIR@/htmlparse.h file_contents)
 string(REPLACE "yy" "html" file_contents "${file_contents}")
-string(REPLACE "unsigned long int" "uint_64_t" file_contents "${file_contents}")
-string(REPLACE "unsigned long" "uint_64_t" file_contents "${file_contents}")
 file(WRITE @CMAKE_CURRENT_BINARY_DIR@/htmlparse.h "${file_contents}")
 
 file(READ @CMAKE_CURRENT_BINARY_DIR@/htmlparse.c file_contents)
 string(REPLACE "yy" "html" file_contents "${file_contents}")
-string(REPLACE "unsigned long int" "uint_64_t" file_contents "${file_contents}")
-string(REPLACE "unsigned long" "uint_64_t" file_contents "${file_contents}")
 file(WRITE @CMAKE_CURRENT_BINARY_DIR@/htmlparse.c "${file_contents}")

diff --git a/cmake/modify_gml2gv_gmlparse.cmake.in b/cmake/modify_gml2gv_gmlparse.cmake.in
index c68fb529788cdaa21386cf5e37370efd87554297..40cbf8c6e5470fd1892c8b5cacfac4231ba328e6 100644 (file)
--- a/cmake/modify_gml2gv_gmlparse.cmake.in
+++ b/cmake/modify_gml2gv_gmlparse.cmake.in
@@ -1,11 +1,7 @@
 file(READ @CMAKE_CURRENT_BINARY_DIR@/gmlparse.h file_contents)
 string(REPLACE "yy" "gml" file_contents "${file_contents}")
-string(REPLACE "unsigned long int" "uint_64_t" file_contents "${file_contents}")
-string(REPLACE "unsigned long" "uint_64_t" file_contents "${file_contents}")
 file(WRITE @CMAKE_CURRENT_BINARY_DIR@/gmlparse.h "${file_contents}")
 
 file(READ @CMAKE_CURRENT_BINARY_DIR@/gmlparse.c file_contents)
 string(REPLACE "yy" "gml" file_contents "${file_contents}")
-string(REPLACE "unsigned long int" "uint_64_t" file_contents "${file_contents}")
-string(REPLACE "unsigned long" "uint_64_t" file_contents "${file_contents}")
 file(WRITE @CMAKE_CURRENT_BINARY_DIR@/gmlparse.c "${file_contents}")

diff --git a/cmd/tools/CMakeLists.txt b/cmd/tools/CMakeLists.txt
index 75e0f9149f19ab6c83bf7682476e0382f91e006a..a275b034e305d2f66055270da0cf6f4cd25da17c 100644 (file)
--- a/cmd/tools/CMakeLists.txt
+++ b/cmd/tools/CMakeLists.txt
@@ -83,8 +83,6 @@ ADD_FLEX_BISON_DEPENDENCY(Gmlscan Gmlparse)
 
 # Modify files generated by Bison and Flex, to match the Autotools build.
 # - Replace "yy" with "gml" in all three files
-# - Replace "unsigned long int" with "uint64_t" in gmlparse.h and gmlparse.c
-# - Replace "unsigned long" with "uint64_t" in gmlparse.h and gmlparse.c
 configure_file(
     "${TOP_SOURCE_DIR}/cmake/modify_gml2gv_gmlparse.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/modify_gml2gv_gmlparse.cmake"

diff --git a/lib/cgraph/CMakeLists.txt b/lib/cgraph/CMakeLists.txt
index 6182bf37a05fa5d43aee4c23d5b48e5161cbf1db..10a98365efd54c7edfbe88aedb85e7b4cb398bea 100644 (file)
--- a/lib/cgraph/CMakeLists.txt
+++ b/lib/cgraph/CMakeLists.txt
@@ -4,8 +4,6 @@ ADD_FLEX_BISON_DEPENDENCY(Scan Grammar)
 
 # Modify files generated by Bison and Flex, to match the Autotools build.
 # - Replace "yy" with "aag" in all three files
-# - Replace "unsigned long int" with "uint64_t" in grammar.h and grammar.c
-# - Replace "unsigned long" with "uint64_t" in grammar.h and grammar.c
 # - Remove declaration of the "isatty()" function from scan.c
 configure_file(
     "${TOP_SOURCE_DIR}/cmake/modify_cgraph_grammar.cmake.in"

diff --git a/lib/common/CMakeLists.txt b/lib/common/CMakeLists.txt
index 0dd335f767850400d06d9631bbce1e6a575c3300..fa9b302d2640fe76af2f44ff5c68ff3f7fbab6b3 100644 (file)
--- a/lib/common/CMakeLists.txt
+++ b/lib/common/CMakeLists.txt
@@ -2,8 +2,6 @@ BISON_TARGET(HTMLparse htmlparse.y ${CMAKE_CURRENT_BINARY_DIR}/htmlparse.c)
 
 # Modify files generated by Bison, to match the Autotools build.
 # - Replace "yy" with "aag"
-# - Replace "unsigned long int" with "uint64_t"
-# - Replace "unsigned long" with "uint64_t"
 configure_file(
     "${TOP_SOURCE_DIR}/cmake/modify_common_htmlparse.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/modify_common_htmlparse.cmake"