You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-cvs@tcl.apache.org by pe...@apache.org on 2017/08/05 00:29:12 UTC
svn commit: r1804167 - in /tcl/rivet/branches/cmake: ChangeLog
src/mod_rivet_ng/mod_rivet_common.c
Author: petasis
Date: Sat Aug 5 00:29:11 2017
New Revision: 1804167
URL: http://svn.apache.org/viewvc?rev=1804167&view=rev
Log:
Fix for <unistd.h>
Modified:
tcl/rivet/branches/cmake/ChangeLog
tcl/rivet/branches/cmake/src/mod_rivet_ng/mod_rivet_common.c
Modified: tcl/rivet/branches/cmake/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/cmake/ChangeLog?rev=1804167&r1=1804166&r2=1804167&view=diff
==============================================================================
--- tcl/rivet/branches/cmake/ChangeLog (original)
+++ tcl/rivet/branches/cmake/ChangeLog Sat Aug 5 00:29:11 2017
@@ -1,15 +1,20 @@
+2017-08-05 Georgios Petasis <pe...@apache.org>
+ * src/mod_rivet_ng/mod_rivet_common.c: Reordered header files, so
+ <unistd.h> (and its check) to come after "mod_rivet.h" that includes
+ "rivet_config.h".
+
2017-08-04 Georgios Petasis <pe...@apache.org>
- * cmake\CMakeLists.txt:
- * cmake\cmake_extra_modules\FindAPR.cmake:
- * src\mod_rivet_ng\TclWebapache.c:
- * src\mod_rivet_ng\mod_rivet.c:
- * src\mod_rivet_ng\mod_rivet.h:
- * src\mod_rivet_ng\mod_rivet_cache.c:
- * src\mod_rivet_ng\mod_rivet_common.c:
- * src\mod_rivet_ng\mod_rivet_generator.c:
- * src\mod_rivet_ng\rivetCore.c:
- * src\parser\rivetParser.c: Changes for fixing compilation errors under
- Windows.
+ * cmake\CMakeLists.txt:
+ * cmake\cmake_extra_modules\FindAPR.cmake:
+ * src\mod_rivet_ng\TclWebapache.c:
+ * src\mod_rivet_ng\mod_rivet.c:
+ * src\mod_rivet_ng\mod_rivet.h:
+ * src\mod_rivet_ng\mod_rivet_cache.c:
+ * src\mod_rivet_ng\mod_rivet_common.c:
+ * src\mod_rivet_ng\mod_rivet_generator.c:
+ * src\mod_rivet_ng\rivetCore.c:
+ * src\parser\rivetParser.c: Changes for fixing compilation errors under
+ Windows.
2017-08-04 Massimo Manghi <mx...@apache.org>
* src/mod_rivet_ng/rivetCore.c: changes demanded by windows compiler
Modified: tcl/rivet/branches/cmake/src/mod_rivet_ng/mod_rivet_common.c
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/cmake/src/mod_rivet_ng/mod_rivet_common.c?rev=1804167&r1=1804166&r2=1804167&view=diff
==============================================================================
--- tcl/rivet/branches/cmake/src/mod_rivet_ng/mod_rivet_common.c (original)
+++ tcl/rivet/branches/cmake/src/mod_rivet_ng/mod_rivet_common.c Sat Aug 5 00:29:11 2017
@@ -27,14 +27,6 @@
#include <apr_strings.h>
#include <apr_env.h>
#include <ap_mpm.h>
-/* as long as we need to emulate ap_chdir_file we need to include unistd.h */
-#ifdef RIVET_HAVE_UNISTD_H
-#include <unistd.h>
-#endif /* RIVET_HAVE_UNISTD_H */
-#ifdef WIN32
-#include <direct.h> // provides POSIX _chdir
-#endif /* WIN32 */
-
#include <apr_file_io.h>
#include <apr_file_info.h>
@@ -47,6 +39,14 @@
#include "rivetCore.h"
#include <mpm_common.h>
+/* as long as we need to emulate ap_chdir_file we need to include unistd.h */
+#ifdef RIVET_HAVE_UNISTD_H
+#include <unistd.h>
+#endif /* RIVET_HAVE_UNISTD_H */
+#ifdef WIN32
+#include <direct.h> // provides POSIX _chdir
+#endif /* WIN32 */
+
/* Function prototypes are defined with EXTERN. Since we are in the same DLL,
* no need to keep this extern... */
#ifdef EXTERN
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org