Browse Source

[3532] Compilation fix for PostgreSQL on i686

Tomek Mrugalski 10 years ago
parent
commit
96a06654f2
3 changed files with 15 additions and 6 deletions
  1. 1 0
      AUTHORS
  2. 11 3
      ChangeLog
  3. 3 3
      src/lib/dhcpsrv/pgsql_lease_mgr.cc

+ 1 - 0
AUTHORS

@@ -58,6 +58,7 @@ We have received the following contributions:
    2014-08: config files examples permission fix
    2014-08: compilation fix for armv7
    2014-08: configure.ac update: AC_PROG_LIBTOOL => LT_INIT
+   2014-08: PostgreSQL compilation fix on i686
 
 Kea uses log4cplus (http://sourceforge.net/projects/log4cplus/) for logging,
 Boost (http://www.boost.org/) library for almost everything, and can use Botan

+ 11 - 3
ChangeLog

@@ -1,3 +1,8 @@
+832.	[bug]		jiri
+	Compilation fix for PostgreSQL on i686. Thanks to Jiri Popelka
+	from RedHat for providing a patch!
+	(Trac #3532, git tbd)
+
 831.	[bug]		marcin
 	Kea deamons report configuration summary when the configuration is
 	completed successfully.
@@ -19,15 +24,18 @@
 	(Trac #3527, git 7aa01a6965b6e9fc39ff005803cada7f58f2e628)
 
 827.	[build]		jiri, tomek
-	Deprecated AC_PROG_LIBTOOL macro replaced by LT_INIT.
+	Deprecated AC_PROG_LIBTOOL macro replaced by LT_INIT. Thanks to
+	Jiri Popelka from RedHat for providing a patch!
 	(Trac #3525, git 6c0aacf29fae1d0501ca69ff6324df8d4fc8c7ee)
 
 826.	[bug]		jiri, tomek
-	Compilation fix for Red Hat running on armv7.
+	Compilation fix for Red Hat running on armv7. Thanks to Jiri
+	Popelka from RedHat for providing a patch!
 	(Trac #3526, git eac5a80472dcb78b538c2ed34cc0534f801e5145)
 
 825.	[bug]		jiri, tomek
-	Example JSON configuration files permission fix.
+	Example JSON configuration files permission fix. Thanks to Jiri
+	Popelka	from RedHat for providing a patch!
 	(Trac #3524, git 822a39ba33870f70787a1f666aed772e06d04d79)
 
 824.	[bug]		marcin

+ 3 - 3
src/lib/dhcpsrv/pgsql_lease_mgr.cc

@@ -703,10 +703,10 @@ private:
 
     /// @Brief Lease4 specific members used for binding and conversion.
     uint32_t        addr4_;
-    unsigned long   hwaddr_length_;
+    size_t          hwaddr_length_;
     std::vector<uint8_t> hwaddr_;
     uint8_t         hwaddr_buffer_[HWAddr::MAX_HWADDR_LEN];
-    unsigned long   client_id_length_;
+    size_t          client_id_length_;
     uint8_t         client_id_buffer_[ClientId::MAX_CLIENT_ID_LEN];
 };
 
@@ -907,7 +907,7 @@ private:
 
     /// @brief Lease6 specific members for binding and conversion.
     //@{
-    unsigned long   duid_length_;
+    size_t          duid_length_;
     vector<uint8_t> duid_;
     uint8_t         duid_buffer_[DUID::MAX_DUID_LEN];
     uint32_t        iaid_;