Rickard Bondesson reported on botan-devel about some problems building

on Solaris 10 with GCC 3.4.3.

First, remove the definition of _XOPEN_SOURCE_EXTENDED=1 in mmap_mem.cpp
and unix_cmd.cpp, because apparently on Solaris defining this macro breaks
C++ compilation entirely with GCC:
  http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6395191

In es_egd.cpp and es_dev.cpp, include <fcntl.h> to get the declaration of
open(), which is apparently where open(2) lives on Solaris - this matches
the include the *BSD man pages for open(2) show, though AFAIK the BSDs
all compiled fine without it (probably due to greater efforts to be
source-compatible with Linux systems by *BSD developers).

I have not been able to test these changes personally on Solaris but
Rickard reports that with these changes everything compiles OK.

Update lib version to 1.8.0-pre. ZOMG. Finally.

7 files changed, 17 insertions, 27 deletions

diff --git a/configure.pl b/configure.pl
index d15115004..99ec8aa8b 100755
--- a/configure.pl
+++ b/configure.pl
@@ -12,8 +12,8 @@ use File::Find;
 use Sys::Hostname;
 
 my $MAJOR_VERSION = 1;
-my $MINOR_VERSION = 7;
-my $PATCH_VERSION = 24;
+my $MINOR_VERSION = 8;
+my $PATCH_VERSION = 0;
 
 my $VERSION_STRING = "$MAJOR_VERSION.$MINOR_VERSION.$PATCH_VERSION";
 
diff --git a/doc/log.txt b/doc/log.txt
index c662a6381..14aac5a70 100644
--- a/doc/log.txt
+++ b/doc/log.txt
@@ -1,4 +1,7 @@
 
+* 1.8.0-pre, 2008-12-??
+ - Fix compilation on Solaris with GCC
+
 * 1.7.24, 2008-12-01
  - Fix a compatibility problem with SHA-512/EMSA3 signature padding
  - Fix bug preventing EGD/PRNGD entropy poller from working
diff --git a/readme.txt b/readme.txt
index a450dea26..7e53f96dd 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,13 +1,12 @@
-Botan 1.7.24 2008-12-01
+Botan 1.8.0-pre 2008-12-??
 
 Botan is a C++ class library for performing a wide variety of
 cryptographic operations.
 
-This is the third release candidate for Botan 1.8.0. I consider it the
-best version available, and recommend all users upgrade from 1.6 or
-earlier versions as soon as possible. Some APIs have changed
-incompatibly since the 1.6 release series, but most applications
-should work as-is or with only simple modifications.
+I consider this release the best version available, and recommend all
+users upgrade from 1.6 or earlier versions as soon as possible. Some
+APIs have changed incompatibly since the 1.6 release series, but most
+applications should work as-is or with only simple modifications.
 
 Botan is under a BSD-like license, the details of which can be found
 in license.txt. More information about the authors and contributors
diff --git a/src/alloc/alloc_mmap/mmap_mem.cpp b/src/alloc/alloc_mmap/mmap_mem.cpp
index e9ea17a53..db9aff296 100644
--- a/src/alloc/alloc_mmap/mmap_mem.cpp
+++ b/src/alloc/alloc_mmap/mmap_mem.cpp
@@ -6,14 +6,6 @@
 #include <botan/mmap_mem.h>
 #include <cstring>
 
-#ifndef _XOPEN_SOURCE
-  #define _XOPEN_SOURCE 500
-#endif
-
-#ifndef _XOPEN_SOURCE_EXTENDED
-  #define _XOPEN_SOURCE_EXTENDED 1
-#endif
-
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
diff --git a/src/entropy/dev_random/es_dev.cpp b/src/entropy/dev_random/es_dev.cpp
index c7a9f6d0e..7b936dbaa 100644
--- a/src/entropy/dev_random/es_dev.cpp
+++ b/src/entropy/dev_random/es_dev.cpp
@@ -4,11 +4,12 @@
 *************************************************/
 
 #include <botan/es_dev.h>
+
+#include <sys/types.h>
 #include <sys/select.h>
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/fcntl.h>
 #include <unistd.h>
+#include <fcntl.h>
 
 namespace Botan {
 
diff --git a/src/entropy/egd/es_egd.cpp b/src/entropy/egd/es_egd.cpp
index 736d49a6f..84773c215 100644
--- a/src/entropy/egd/es_egd.cpp
+++ b/src/entropy/egd/es_egd.cpp
@@ -10,9 +10,12 @@
 #include <cstring>
 
 #include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <unistd.h>
 
 #ifndef PF_LOCAL
   #define PF_LOCAL PF_UNIX
diff --git a/src/entropy/unix_procs/unix_cmd.cpp b/src/entropy/unix_procs/unix_cmd.cpp
index 79cce7da4..4c7f674db 100644
--- a/src/entropy/unix_procs/unix_cmd.cpp
+++ b/src/entropy/unix_procs/unix_cmd.cpp
@@ -3,14 +3,6 @@
 * (C) 1999-2007 Jack Lloyd                       *
 *************************************************/
 
-#ifndef _XOPEN_SOURCE
-  #define _XOPEN_SOURCE 500
-#endif
-
-#ifndef _XOPEN_SOURCE_EXTENDED
-  #define _XOPEN_SOURCE_EXTENDED 1
-#endif
-
 #include <botan/unix_cmd.h>
 #include <botan/parsing.h>
 #include <botan/exceptn.h>