Add hxx extension for headers and lib prefix for library dirs

12 files changed, 47 insertions, 47 deletions

diff --git a/web/apache/log b/web/apache/log.hxx
index dda9099..4397875 100644
--- a/web/apache/log
+++ b/web/apache/log.hxx
@@ -1,9 +1,9 @@
-// file      : web/apache/log -*- C++ -*-
+// file      : web/apache/log.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef WEB_APACHE_LOG
-#define WEB_APACHE_LOG
+#ifndef WEB_APACHE_LOG_HXX
+#define WEB_APACHE_LOG_HXX
 
 #include <httpd.h>       // request_rec, server_rec
 #include <http_log.h>
@@ -12,7 +12,7 @@
 #include <cstdint>   // uint64_t
 #include <algorithm> // min()
 
-#include <web/module>
+#include <web/module.hxx>
 
 namespace web
 {
@@ -78,4 +78,4 @@ namespace web
   }
 }
 
-#endif // WEB_APACHE_LOG
+#endif // WEB_APACHE_LOG_HXX
diff --git a/web/apache/request.cxx b/web/apache/request.cxx
index b4fb080..219f887 100644
--- a/web/apache/request.cxx
+++ b/web/apache/request.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <web/apache/request>
+#include <web/apache/request.hxx>
 
 #include <apr_tables.h>  // apr_table_*, apr_array_header_t
 #include <apr_strings.h> // apr_pstrdup()
@@ -31,7 +31,7 @@
 #include <butl/optional>
 #include <butl/timestamp>
 
-#include <web/mime-url-encoding>
+#include <web/mime-url-encoding.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/web/apache/request b/web/apache/request.hxx
index a35c5dc..0488fb2 100644
--- a/web/apache/request
+++ b/web/apache/request.hxx
@@ -1,9 +1,9 @@
-// file      : web/apache/request -*- C++ -*-
+// file      : web/apache/request.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef WEB_APACHE_REQUEST
-#define WEB_APACHE_REQUEST
+#ifndef WEB_APACHE_REQUEST_HXX
+#define WEB_APACHE_REQUEST_HXX
 
 #include <httpd.h> // request_rec, HTTP_*, OK, M_POST
 
@@ -14,8 +14,8 @@
 #include <ostream>
 #include <streambuf>
 
-#include <web/module>
-#include <web/apache/stream>
+#include <web/module.hxx>
+#include <web/apache/stream.hxx>
 
 namespace web
 {
@@ -187,4 +187,4 @@ namespace web
 
 #include <web/apache/request.ixx>
 
-#endif // WEB_APACHE_REQUEST
+#endif // WEB_APACHE_REQUEST_HXX
diff --git a/web/apache/service.cxx b/web/apache/service.cxx
index ca8e235..8c3fa82 100644
--- a/web/apache/service.cxx
+++ b/web/apache/service.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <web/apache/service>
+#include <web/apache/service.hxx>
 
 #include <apr_pools.h> // apr_palloc()
 
@@ -18,8 +18,8 @@
 
 #include <butl/optional>
 
-#include <web/module>
-#include <web/apache/log>
+#include <web/module.hxx>
+#include <web/apache/log.hxx>
 
 using namespace std;
 
diff --git a/web/apache/service b/web/apache/service.hxx
index 45cf39b..44d064f 100644
--- a/web/apache/service
+++ b/web/apache/service.hxx
@@ -1,9 +1,9 @@
-// file      : web/apache/service -*- C++ -*-
+// file      : web/apache/service.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef WEB_APACHE_SERVICE
-#define WEB_APACHE_SERVICE
+#ifndef WEB_APACHE_SERVICE_HXX
+#define WEB_APACHE_SERVICE_HXX
 
 #include <apr_pools.h>   // apr_pool_t
 #include <apr_hooks.h>   // APR_HOOK_*
@@ -16,9 +16,9 @@
 #include <string>
 #include <cassert>
 
-#include <web/module>
-#include <web/apache/log>
-#include <web/apache/request>
+#include <web/module.hxx>
+#include <web/apache/log.hxx>
+#include <web/apache/request.hxx>
 
 namespace web
 {
@@ -327,4 +327,4 @@ namespace web
 
 #include <web/apache/service.txx>
 
-#endif // WEB_APACHE_SERVICE
+#endif // WEB_APACHE_SERVICE_HXX
diff --git a/web/apache/stream b/web/apache/stream.hxx
index d4abb4e..3bb422d 100644
--- a/web/apache/stream
+++ b/web/apache/stream.hxx
@@ -1,9 +1,9 @@
-// file      : web/apache/stream -*- C++ -*-
+// file      : web/apache/stream.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef WEB_APACHE_STREAM
-#define WEB_APACHE_STREAM
+#ifndef WEB_APACHE_STREAM_HXX
+#define WEB_APACHE_STREAM_HXX
 
 #include <httpd.h>         // request_rec, HTTP_*
 #include <http_protocol.h> // ap_*()
@@ -14,7 +14,7 @@
 #include <streambuf>
 #include <algorithm> // min(), max()
 
-#include <web/module> // invalid_request
+#include <web/module.hxx> // invalid_request
 
 namespace web
 {
@@ -146,4 +146,4 @@ namespace web
   }
 }
 
-#endif // WEB_APACHE_STREAM
+#endif // WEB_APACHE_STREAM_HXX
diff --git a/web/mime-url-encoding.cxx b/web/mime-url-encoding.cxx
index fa85dd3..e0022bc 100644
--- a/web/mime-url-encoding.cxx
+++ b/web/mime-url-encoding.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <web/mime-url-encoding>
+#include <web/mime-url-encoding.hxx>
 
 #include <ios>       // hex, uppercase, right
 #include <string>
diff --git a/web/mime-url-encoding b/web/mime-url-encoding.hxx
index 9db0887..d45f4ca 100644
--- a/web/mime-url-encoding
+++ b/web/mime-url-encoding.hxx
@@ -1,9 +1,9 @@
-// file      : web/mime-url-encoding -*- C++ -*-
+// file      : web/mime-url-encoding.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef WEB_MIME_URL_ENCODING
-#define WEB_MIME_URL_ENCODING
+#ifndef WEB_MIME_URL_ENCODING_HXX
+#define WEB_MIME_URL_ENCODING_HXX
 
 #include <string>
 #include <iosfwd>
@@ -27,4 +27,4 @@ namespace web
   mime_url_decode (const char* b, const char* e, bool trim = false);
 }
 
-#endif // WEB_MIME_URL_ENCODING
+#endif // WEB_MIME_URL_ENCODING_HXX
diff --git a/web/module b/web/module.hxx
index 1e588a4..1864673 100644
--- a/web/module
+++ b/web/module.hxx
@@ -1,9 +1,9 @@
-// file      : web/module -*- C++ -*-
+// file      : web/module.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef WEB_MODULE
-#define WEB_MODULE
+#ifndef WEB_MODULE_HXX
+#define WEB_MODULE_HXX
 
 #include <map>
 #include <string>
@@ -264,4 +264,4 @@ namespace web
   };
 }
 
-#endif // WEB_MODULE
+#endif // WEB_MODULE_HXX
diff --git a/web/xhtml-fragment.cxx b/web/xhtml-fragment.cxx
index 3147c72..1d883ae 100644
--- a/web/xhtml-fragment.cxx
+++ b/web/xhtml-fragment.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <web/xhtml-fragment>
+#include <web/xhtml-fragment.hxx>
 
 #include <string>
 #include <cassert>
@@ -10,7 +10,7 @@
 #include <xml/parser>
 #include <xml/serializer>
 
-#include <web/xhtml>
+#include <web/xhtml.hxx>
 
 using namespace std;
 using namespace xml;
diff --git a/web/xhtml-fragment b/web/xhtml-fragment.hxx
index 9f602e0..9d58bbf 100644
--- a/web/xhtml-fragment
+++ b/web/xhtml-fragment.hxx
@@ -1,9 +1,9 @@
-// file      : web/xhtml-fragment -*- C++ -*-
+// file      : web/xhtml-fragment.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef WEB_XHTML_FRAGMENT
-#define WEB_XHTML_FRAGMENT
+#ifndef WEB_XHTML_FRAGMENT_HXX
+#define WEB_XHTML_FRAGMENT_HXX
 
 #include <string>
 #include <vector>
@@ -45,4 +45,4 @@ namespace web
   }
 }
 
-#endif // WEB_XHTML_FRAGMENT
+#endif // WEB_XHTML_FRAGMENT_HXX
diff --git a/web/xhtml b/web/xhtml.hxx
index 58dee7b..0809860 100644
--- a/web/xhtml
+++ b/web/xhtml.hxx
@@ -1,9 +1,9 @@
-// file      : web/xhtml -*- C++ -*-
+// file      : web/xhtml.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef WEB_XHTML
-#define WEB_XHTML
+#ifndef WEB_XHTML_HXX
+#define WEB_XHTML_HXX
 
 #include <xml/serializer>
 
@@ -348,4 +348,4 @@ namespace web
   }
 }
 
-#endif // WEB_XHTML
+#endif // WEB_XHTML_HXX