diff options
| author | Daniel Richard G <danielg@teragram.com> | 2012-08-30 15:05:55 -0400 |
|---|---|---|
| committer | Daniel Richard G <danielg@teragram.com> | 2012-08-30 15:13:09 -0400 |
| commit | 5ad0ac47d449436ce7013755258f868b5c1afeab (patch) | |
| tree | 0f2c49d780d29efa2f7820fc969b6144200bfc1f | |
| parent | 6cb2d3327186097a65f75c6c36b9a68170f905a6 (diff) | |
| download | raptor-5ad0ac47d449436ce7013755258f868b5c1afeab.tar.gz | |
Remove all traces of win32_raptor_config.h
Remove the file itself, all #include uses of it, and all references to it,
as this file is no longer needed.
69 files changed, 1 insertions, 459 deletions
diff --git a/configure.ac b/configure.ac index fceded6e..21ae4ed6 100644 --- a/configure.ac +++ b/configure.ac @@ -1275,7 +1275,6 @@ docs/version.xml examples/Makefile scripts/Makefile src/raptor2.h -src/win32_raptor_config.h src/Makefile tests/Makefile tests/feeds/Makefile diff --git a/docs/Makefile.am b/docs/Makefile.am index 9bbe66c8..46662f0b 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -69,7 +69,6 @@ IGNORE_HFILES= \ turtle_common.h \ turtle_lexer.h \ turtle_parser.h \ - win32_raptor_config.h \ git-version.h # CFLAGS and LDFLAGS for compiling scan program. Only needed diff --git a/examples/grapper.c b/examples/grapper.c index 317b72b8..b255de4e 100644 --- a/examples/grapper.c +++ b/examples/grapper.c @@ -29,10 +29,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_config.h> -#endif - #include <stdio.h> #include <string.h> #include <stdarg.h> diff --git a/examples/raptor_abort.c b/examples/raptor_abort.c index 399717f4..d71fe9e5 100644 --- a/examples/raptor_abort.c +++ b/examples/raptor_abort.c @@ -27,10 +27,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_config.h> -#endif - #include <stdio.h> #include <string.h> #include <stdarg.h> diff --git a/scripts/fix-flex b/scripts/fix-flex index 34a15efc..0ec55ee2 100755 --- a/scripts/fix-flex +++ b/scripts/fix-flex @@ -18,10 +18,6 @@ print <<'EOT'; #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - EOT $line_offset += 8; # added 8 lines to output diff --git a/src/.gitignore b/src/.gitignore index 8d3b8d04..563134e9 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -32,4 +32,3 @@ turtle_lexer.h turtle_parser.c turtle_parser.h turtle_parser.output -win32_raptor_config.h diff --git a/src/Makefile.am b/src/Makefile.am index d90b0f53..7ba6edce 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,7 +27,7 @@ lib_LTLIBRARIES = libraptor2.la pkginclude_HEADERS = raptor.h nodist_pkginclude_HEADERS = raptor2.h -noinst_HEADERS = raptor_internal.h win32_raptor_config.h +noinst_HEADERS = raptor_internal.h TESTS=raptor_parse_test raptor_rfc2396_test raptor_uri_test \ raptor_namespace_test strcasecmp_test raptor_www_test \ diff --git a/src/ntriples_parse.c b/src/ntriples_parse.c index 3c2edc6f..75ab8fdf 100644 --- a/src/ntriples_parse.c +++ b/src/ntriples_parse.c @@ -30,10 +30,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/parsedate.y b/src/parsedate.y index 285fb63a..ebd3d4c8 100644 --- a/src/parsedate.y +++ b/src/parsedate.y @@ -31,10 +31,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #include <stdio.h> #include <sys/types.h> #include <time.h> diff --git a/src/raptor_abbrev.c b/src/raptor_abbrev.c index 172c9134..7fcc141c 100644 --- a/src/raptor_abbrev.c +++ b/src/raptor_abbrev.c @@ -27,11 +27,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_avltree.c b/src/raptor_avltree.c index 62ff93cd..4965c3c8 100644 --- a/src/raptor_avltree.c +++ b/src/raptor_avltree.c @@ -37,10 +37,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #ifdef HAVE_STDLIB_H #include <stdlib.h> #endif diff --git a/src/raptor_concepts.c b/src/raptor_concepts.c index 78d22a4f..4dce85ca 100644 --- a/src/raptor_concepts.c +++ b/src/raptor_concepts.c @@ -26,10 +26,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - /* Raptor includes */ #include "raptor2.h" #include "raptor_internal.h" diff --git a/src/raptor_general.c b/src/raptor_general.c index b10cac14..ec952ea1 100644 --- a/src/raptor_general.c +++ b/src/raptor_general.c @@ -27,11 +27,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_grddl.c b/src/raptor_grddl.c index 7c1714bc..d0c587a1 100644 --- a/src/raptor_grddl.c +++ b/src/raptor_grddl.c @@ -35,10 +35,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_guess.c b/src/raptor_guess.c index 07cf8c06..0417f0fb 100644 --- a/src/raptor_guess.c +++ b/src/raptor_guess.c @@ -25,10 +25,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_iostream.c b/src/raptor_iostream.c index 4d386db8..2e22ead6 100644 --- a/src/raptor_iostream.c +++ b/src/raptor_iostream.c @@ -26,10 +26,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_json.c b/src/raptor_json.c index b05a6080..6976b786 100644 --- a/src/raptor_json.c +++ b/src/raptor_json.c @@ -29,10 +29,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_json_writer.c b/src/raptor_json_writer.c index e7966b86..2b65daa9 100644 --- a/src/raptor_json_writer.c +++ b/src/raptor_json_writer.c @@ -26,11 +26,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_librdfa.c b/src/raptor_librdfa.c index b3c43043..0d214cf5 100644 --- a/src/raptor_librdfa.c +++ b/src/raptor_librdfa.c @@ -26,10 +26,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_libxml.c b/src/raptor_libxml.c index d1281a66..cee87a58 100644 --- a/src/raptor_libxml.c +++ b/src/raptor_libxml.c @@ -27,10 +27,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_locator.c b/src/raptor_locator.c index 46023bb3..4628cb1e 100644 --- a/src/raptor_locator.c +++ b/src/raptor_locator.c @@ -27,11 +27,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_log.c b/src/raptor_log.c index de40f900..0a3509ec 100644 --- a/src/raptor_log.c +++ b/src/raptor_log.c @@ -27,11 +27,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_memstr.c b/src/raptor_memstr.c index d3100f78..2168e91d 100644 --- a/src/raptor_memstr.c +++ b/src/raptor_memstr.c @@ -26,11 +26,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <string.h> /* Raptor includes */ diff --git a/src/raptor_namespace.c b/src/raptor_namespace.c index b1e1519e..b784841c 100644 --- a/src/raptor_namespace.c +++ b/src/raptor_namespace.c @@ -27,11 +27,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_nfc_icu.c b/src/raptor_nfc_icu.c index b1d420cf..50433808 100644 --- a/src/raptor_nfc_icu.c +++ b/src/raptor_nfc_icu.c @@ -26,10 +26,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #ifdef HAVE_STDLIB_H #include <stdlib.h> #endif diff --git a/src/raptor_nfc_test.c b/src/raptor_nfc_test.c index 056b3238..625cf930 100644 --- a/src/raptor_nfc_test.c +++ b/src/raptor_nfc_test.c @@ -37,10 +37,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #include <stdio.h> #include <string.h> #include <ctype.h> /* for isprint() */ diff --git a/src/raptor_option.c b/src/raptor_option.c index 834c1c65..119dfb8c 100644 --- a/src/raptor_option.c +++ b/src/raptor_option.c @@ -27,11 +27,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_parse.c b/src/raptor_parse.c index 5e2c5e5f..e2f8704f 100644 --- a/src/raptor_parse.c +++ b/src/raptor_parse.c @@ -27,11 +27,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_permute_test.c b/src/raptor_permute_test.c index 1c6530df..ad504fb7 100644 --- a/src/raptor_permute_test.c +++ b/src/raptor_permute_test.c @@ -26,10 +26,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #include <stdio.h> #include <string.h> diff --git a/src/raptor_qname.c b/src/raptor_qname.c index 4afd84d4..d59d0247 100644 --- a/src/raptor_qname.c +++ b/src/raptor_qname.c @@ -27,11 +27,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_rdfxml.c b/src/raptor_rdfxml.c index d722d711..cc02430a 100644 --- a/src/raptor_rdfxml.c +++ b/src/raptor_rdfxml.c @@ -27,11 +27,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_rfc2396.c b/src/raptor_rfc2396.c index b23711bd..eda5de1a 100644 --- a/src/raptor_rfc2396.c +++ b/src/raptor_rfc2396.c @@ -27,10 +27,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_rss.c b/src/raptor_rss.c index 4d43ff85..adb4861a 100644 --- a/src/raptor_rss.c +++ b/src/raptor_rss.c @@ -26,10 +26,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_rss_common.c b/src/raptor_rss_common.c index 6f53c15b..52e07bd8 100644 --- a/src/raptor_rss_common.c +++ b/src/raptor_rss_common.c @@ -26,10 +26,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_sax2.c b/src/raptor_sax2.c index 02b929dd..d52ae51e 100644 --- a/src/raptor_sax2.c +++ b/src/raptor_sax2.c @@ -27,11 +27,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_sequence.c b/src/raptor_sequence.c index 790e802c..8943ec6a 100644 --- a/src/raptor_sequence.c +++ b/src/raptor_sequence.c @@ -27,10 +27,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_serialize.c b/src/raptor_serialize.c index 3da0e777..12e3f0ac 100644 --- a/src/raptor_serialize.c +++ b/src/raptor_serialize.c @@ -26,11 +26,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_serialize_dot.c b/src/raptor_serialize_dot.c index 3710fa6c..78e4f52e 100644 --- a/src/raptor_serialize_dot.c +++ b/src/raptor_serialize_dot.c @@ -25,11 +25,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_serialize_html.c b/src/raptor_serialize_html.c index 617c2db5..ae962d1f 100644 --- a/src/raptor_serialize_html.c +++ b/src/raptor_serialize_html.c @@ -24,11 +24,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_serialize_json.c b/src/raptor_serialize_json.c index fba51a60..6bd74d5f 100644 --- a/src/raptor_serialize_json.c +++ b/src/raptor_serialize_json.c @@ -24,11 +24,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_serialize_ntriples.c b/src/raptor_serialize_ntriples.c index 6ead0bc1..80d8ee18 100644 --- a/src/raptor_serialize_ntriples.c +++ b/src/raptor_serialize_ntriples.c @@ -25,11 +25,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_serialize_rdfxml.c b/src/raptor_serialize_rdfxml.c index 032a0a8b..0d5550a7 100644 --- a/src/raptor_serialize_rdfxml.c +++ b/src/raptor_serialize_rdfxml.c @@ -25,11 +25,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_serialize_rdfxmla.c b/src/raptor_serialize_rdfxmla.c index fe60096c..fc3307f6 100644 --- a/src/raptor_serialize_rdfxmla.c +++ b/src/raptor_serialize_rdfxmla.c @@ -26,11 +26,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_serialize_rss.c b/src/raptor_serialize_rss.c index d635d413..a13717e0 100644 --- a/src/raptor_serialize_rss.c +++ b/src/raptor_serialize_rss.c @@ -26,10 +26,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_serialize_turtle.c b/src/raptor_serialize_turtle.c index eb07775b..249ebf10 100644 --- a/src/raptor_serialize_turtle.c +++ b/src/raptor_serialize_turtle.c @@ -27,11 +27,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_set.c b/src/raptor_set.c index 3228017f..334416ce 100644 --- a/src/raptor_set.c +++ b/src/raptor_set.c @@ -28,11 +28,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <stdarg.h> diff --git a/src/raptor_statement.c b/src/raptor_statement.c index 8281f46e..a8fb5235 100644 --- a/src/raptor_statement.c +++ b/src/raptor_statement.c @@ -24,11 +24,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_stringbuffer.c b/src/raptor_stringbuffer.c index 1d6ab0d2..60299290 100644 --- a/src/raptor_stringbuffer.c +++ b/src/raptor_stringbuffer.c @@ -28,11 +28,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <stdarg.h> diff --git a/src/raptor_syntax_description.c b/src/raptor_syntax_description.c index 7e135a9f..eb549b2e 100644 --- a/src/raptor_syntax_description.c +++ b/src/raptor_syntax_description.c @@ -26,11 +26,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> diff --git a/src/raptor_term.c b/src/raptor_term.c index 9c43ec96..1871a015 100644 --- a/src/raptor_term.c +++ b/src/raptor_term.c @@ -24,11 +24,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_turtle_writer.c b/src/raptor_turtle_writer.c index 6eb1c275..2572090d 100644 --- a/src/raptor_turtle_writer.c +++ b/src/raptor_turtle_writer.c @@ -28,11 +28,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_unicode.c b/src/raptor_unicode.c index 347bac73..ab02cf4e 100644 --- a/src/raptor_unicode.c +++ b/src/raptor_unicode.c @@ -27,10 +27,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #include <stdio.h> #include <string.h> #include <stdarg.h> diff --git a/src/raptor_uri.c b/src/raptor_uri.c index 8230b520..f700e738 100644 --- a/src/raptor_uri.c +++ b/src/raptor_uri.c @@ -27,10 +27,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_win32.c b/src/raptor_win32.c index d97d73b2..d41eaf2a 100644 --- a/src/raptor_win32.c +++ b/src/raptor_win32.c @@ -28,11 +28,6 @@ #endif #ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - -#ifdef WIN32 /* Only on WIN32 systems */ diff --git a/src/raptor_www.c b/src/raptor_www.c index f70dcfe0..e7af8375 100644 --- a/src/raptor_www.c +++ b/src/raptor_www.c @@ -27,10 +27,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #include <stdio.h> #include <string.h> #include <stdarg.h> diff --git a/src/raptor_www_curl.c b/src/raptor_www_curl.c index 27182ec5..1ed1076d 100644 --- a/src/raptor_www_curl.c +++ b/src/raptor_www_curl.c @@ -27,10 +27,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #ifdef RAPTOR_WWW_LIBCURL #include <stdio.h> diff --git a/src/raptor_www_libfetch.c b/src/raptor_www_libfetch.c index f2e54b4f..55f85a57 100644 --- a/src/raptor_www_libfetch.c +++ b/src/raptor_www_libfetch.c @@ -27,10 +27,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #ifdef RAPTOR_WWW_LIBFETCH #include <stdio.h> diff --git a/src/raptor_www_libxml.c b/src/raptor_www_libxml.c index 8e53a4e7..e2b9f3e3 100644 --- a/src/raptor_www_libxml.c +++ b/src/raptor_www_libxml.c @@ -27,10 +27,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #include <stdio.h> #include <string.h> #include <stdarg.h> diff --git a/src/raptor_www_test.c b/src/raptor_www_test.c index 2968c96a..08833723 100644 --- a/src/raptor_www_test.c +++ b/src/raptor_www_test.c @@ -27,10 +27,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #include <stdio.h> #include <string.h> #include <stdarg.h> diff --git a/src/raptor_xml.c b/src/raptor_xml.c index eb09d7bf..d55ce56f 100644 --- a/src/raptor_xml.c +++ b/src/raptor_xml.c @@ -27,11 +27,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c index 51eb4e94..7639e62a 100644 --- a/src/raptor_xml_writer.c +++ b/src/raptor_xml_writer.c @@ -27,11 +27,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/snprintf.c b/src/snprintf.c index e8c55635..03cf8781 100644 --- a/src/snprintf.c +++ b/src/snprintf.c @@ -11,10 +11,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #ifdef HAVE_VASPRINTF #define _GNU_SOURCE /* to get vasprintf() available */ #endif diff --git a/src/strcasecmp.c b/src/strcasecmp.c index c40252c4..a1a36059 100644 --- a/src/strcasecmp.c +++ b/src/strcasecmp.c @@ -10,10 +10,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/turtle_common.c b/src/turtle_common.c index 72618eec..5c253bf6 100644 --- a/src/turtle_common.c +++ b/src/turtle_common.c @@ -26,10 +26,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/turtle_lexer.l b/src/turtle_lexer.l index 6d5bc301..99c28703 100644 --- a/src/turtle_lexer.l +++ b/src/turtle_lexer.l @@ -83,10 +83,6 @@ #ifdef HAVE_CONFIG_H #include <raptor_config.h> #endif - -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif */ #include <stdio.h> diff --git a/src/turtle_parser.y b/src/turtle_parser.y index 2d72435b..d4913f91 100644 --- a/src/turtle_parser.y +++ b/src/turtle_parser.y @@ -33,10 +33,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/src/win32_raptor_config.h.in b/src/win32_raptor_config.h.in deleted file mode 100644 index 34f500c7..00000000 --- a/src/win32_raptor_config.h.in +++ /dev/null @@ -1,170 +0,0 @@ -/* -*- Mode: c; c-basic-offset: 2 -*- - * - * win32_config.h - Raptor WIN32 hard-coded config - * - * Copyright (C) 2002-2008, David Beckett http://www.dajobe.org/ - * Copyright (C) 2002-2005, University of Bristol, UK http://www.bristol.ac.uk/ - * - * This package is Free Software and part of Redland http://librdf.org/ - * - * It is licensed under the following three licenses as alternatives: - * 1. GNU Lesser General Public License (LGPL) V2.1 or any newer version - * 2. GNU General Public License (GPL) V2 or any newer version - * 3. Apache License, V2.0 or any newer version - * - * You may not use this file except in compliance with at least one of - * the above three licenses. - * - * See LICENSE.html or LICENSE.txt at the top of this package for the - * complete terms and further detail along with the license texts for - * the licenses in COPYING.LIB, COPYING and LICENSE-2.0.txt respectively. - * - * - */ - - -#if 0 /**** obsolescent ****/ -#ifndef WIN32_CONFIG_H -#define WIN32_CONFIG_H - - -#ifdef __cplusplus -extern "C" { -#endif - -#define WIN32_LEAN_AND_MEAN 1 - -/* getopt is not in standard win32 C library - define if we have it */ -/* #define HAVE_GETOPT_H 1 */ - -#define HAVE_STDLIB_H 1 - -#if 0 -/* For using expat on win32 */ -#define RAPTOR_XML_EXPAT 1 -#define HAVE_EXPAT_H 1 - -#else -/* For using libxml2 on win32 */ -#define RAPTOR_XML_LIBXML -#define HAVE_LIBXML_XMLREADER_H -/* does libxml struct xmlEntity have a field etype */ -/*#define RAPTOR_LIBXML_ENTITY_ETYPE*/ - -/* does libxml struct xmlEntity have a field name_length */ -/*#define RAPTOR_LIBXML_ENTITY_NAME_LENGTH*/ - -/* Define to 1 if you have the `xmlCtxtUseOptions' function. */ -#define HAVE_XMLCTXTUSEOPTIONS 1 - -/* Define to 1 if you have the `xmlSAX2InternalSubset' function. */ -#define HAVE_XMLSAX2INTERNALSUBSET 1 - -/* does libxml xmlSAXHandler have externalSubset field */ -/*#define RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET*/ - -/* does libxml xmlSAXHandler have initialized field */ -/*#define RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED*/ -#endif - -#define HAVE_STRICMP 1 - -/* MS names for these functions */ -#define vsnprintf _vsnprintf -#define snprintf _snprintf -#define access _access -#define stricmp _stricmp -#define strnicmp _strnicmp -#define isnan(n) _isnan(n) - -/*#define HAVE_C99_VSNPRINTF */ - -/* for access() which is POSIX but doesn't seem to have the defines in VC */ -#ifndef R_OK -#define R_OK 4 -#endif - -/* __func__ doesn't exist in Visual Studio 6 */ -#define __func__ "" - -/* - * Defines that come from config.h - */ - -/* Release version as a decimal */ -#define RAPTOR_VERSION_DECIMAL @RAPTOR_VERSION_DECIMAL@ - -/* Version number of package */ -#define RAPTOR_VERSION_STRING "@VERSION@" - -/* Major version number */ -#define RAPTOR_VERSION_MAJOR @RAPTOR_VERSION_MAJOR@ - -/* Minor version number */ -#define RAPTOR_VERSION_MINOR @RAPTOR_VERSION_MINOR@ - -/* Release version number */ -#define RAPTOR_VERSION_RELEASE @RAPTOR_VERSION_RELEASE@ - - -#ifdef RAPTOR_XML_LIBXML -/* RSS parser needs libxml 2.5.x+ */ -#define RAPTOR_PARSER_RSS 1 -#else -#undef RAPTOR_PARSER_RSS -#endif - -#define RAPTOR_PARSER_GUESS 1 -#define RAPTOR_PARSER_GRDDL 1 -#define RAPTOR_PARSER_N3 1 -#define RAPTOR_PARSER_TURTLE 1 -#define RAPTOR_PARSER_NTRIPLES 1 -#define RAPTOR_PARSER_RDFXML 1 - -#define RAPTOR_SERIALIZER_ATOM 1 -#define RAPTOR_SERIALIZER_RSS_1_0 1 -#define RAPTOR_SERIALIZER_RDFXML 1 -#define RAPTOR_SERIALIZER_RDFXML_ABBREV 1 -#define RAPTOR_SERIALIZER_NTRIPLES 1 - -#define RAPTOR_WWW_LIBCURL 1 - - -#include <windows.h> - -#include <io.h> -#include <memory.h> - -/* bison: output uses ERROR in an enum which breaks if this is defined */ -#ifdef ERROR -#undef ERROR -#endif - -/* flex: const is available */ -#define YY_USE_CONST - -#undef RAPTOR_INLINE -#define RAPTOR_INLINE __inline - -/* The size of a `unsigned char', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_CHAR 1 - -/* The size of a `unsigned short', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_SHORT 2 - -/* The size of a `unsigned int', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_INT 4 - -/* The size of a `unsigned long', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_LONG 4 - -/* The size of a `unsigned long long', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_LONG_LONG 8 - - -#ifdef __cplusplus -} -#endif - -#endif -#endif /**** obsolescent ****/ diff --git a/utils/rapper.c b/utils/rapper.c index b0660c09..c1301775 100644 --- a/utils/rapper.c +++ b/utils/rapper.c @@ -27,10 +27,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #include <stdio.h> #include <string.h> diff --git a/utils/rdfdiff.c b/utils/rdfdiff.c index 0cd62791..d7a54fc3 100644 --- a/utils/rdfdiff.c +++ b/utils/rdfdiff.c @@ -28,10 +28,6 @@ #include <raptor_config.h> #endif -#ifdef WIN32 -#include <win32_raptor_config.h> -#endif - #include <stdio.h> #include <string.h> |