more code cleanup

README

@@ -16,8 +16,8 @@ from C and C++.
 				 -*-
 
 Flex and Bison are not required in order to build this
-package. However, if you modify the .l or .y files, you must have Flex
-(2.5.31 or better) and Bison (2.1 or better), respectively.
+package. However, you will need them if you modify the .l or .y files. See
+the list of required build tool versions below.
 
 				 -*-
 
@@ -57,7 +57,7 @@ $ ./configure --host=arm-linux-androideabi \
 
 4) Build libconfig
 
-make
+$ make
 
 				 -*-
 
@@ -68,3 +68,7 @@ Automake 1.14.1
 Bison 3.0.2
 Flex 2.5.39
 Libtool 2.4.2
+
+				 -*-
+
+Libconfig may be found on github at https://github.com/hyperrealm/libconfig

configure.ac

@@ -31,7 +31,7 @@ cat <<EOF
 *******************************************************************
 You do not seem to have flex. While flex is not required to build
 libconfig, you may need it to regenerate the lexer if you change
-the scanner.l file. Flex 2.5.33 or newer is recommended.
+the scanner.l file.
 *******************************************************************
 EOF
 fi

lib/libconfig.c

@@ -52,14 +52,15 @@
 /* ------------------------------------------------------------------------- */
 
 #ifndef LIBCONFIG_STATIC
-#if (defined(WIN32) || defined(_WIN32) || defined(__WIN32__))
+#if (defined(WIN32) || defined(_WIN32) || defined(__WIN32__)    \
+     || defined(WIN64) || defined(_WIN64))
 
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
   return(TRUE);
 }
 
-#endif /* WIN32 */
+#endif /* WIN32 || WIN64 */
 #endif /* LIBCONFIG_STATIC */
 
 /* ------------------------------------------------------------------------- */
@@ -71,11 +72,6 @@ static void __config_write_setting(const config_setting_t *setting,
                                    FILE *stream, int depth,
                                    unsigned short tab_width);
 
-extern int libconfig_yyparse(void *scanner, struct parse_context *ctx,
-                             struct scan_context *scan_ctx);
-extern int libconfig_yylex_init_extra(struct scan_context *scan_ctx,
-                                      yyscan_t *scanner);
-
 /* ------------------------------------------------------------------------- */
 
 static void __config_locale_override(void)
@@ -1614,4 +1610,4 @@ int config_setting_index(const config_setting_t *setting)
 }
 
 /* ------------------------------------------------------------------------- */
-/* eof */
+

lib/libconfigcpp.c++

@@ -1436,4 +1436,3 @@ int SettingConstIterator::operator-(SettingConstIterator const &other) const
 
 } // namespace libconfig
 
-// eof

lib/scanctx.c

@@ -168,4 +168,3 @@ const char *scanctx_current_filename(struct scan_context *ctx)
 }
 
 /* ------------------------------------------------------------------------- */
-/* eof */

lib/strbuf.c

@@ -55,4 +55,3 @@ void strbuf_append(strbuf_t *buf, const char *text)
 }
 
 /* ------------------------------------------------------------------------- */
-/* eof */