propagate from branch 'net.randombit.botan' (head 744dccf92270cf16b80b50ee2759424c9866b256)

            to branch 'net.randombit.botan.c++0x' (head 2aa1acac1d05e8ea9991fe39015b1db9abc3b24e)

4 files changed, 13 insertions, 17 deletions

diff --git a/src/libstate/info.txt b/src/libstate/info.txt
index aa74e6573..342bdb5f2 100644
--- a/src/libstate/info.txt
+++ b/src/libstate/info.txt
@@ -2,23 +2,26 @@ load_on always
 
 define LIBSTATE_MODULE
 
-<add>
+<header:public>
 botan.h
+libstate.h
+init.h
+look_pk.h
+lookup.h
+pk_engine.h
+scan_name.h
+</header:public>
+
+<source>
 get_enc.cpp
 init.cpp
-init.h
 libstate.cpp
-libstate.h
 look_pk.cpp
-look_pk.h
 lookup.cpp
-lookup.h
 pk_engine.cpp
-pk_engine.h
 policy.cpp
 scan_name.cpp
-scan_name.h
-</add>
+</source>
 
 <requires>
 algo_factory
diff --git a/src/libstate/libstate.cpp b/src/libstate/libstate.cpp
index dd7fe7eaf..06b05276f 100644
--- a/src/libstate/libstate.cpp
+++ b/src/libstate/libstate.cpp
@@ -16,7 +16,7 @@
 #include <algorithm>
 
 #if defined(BOTAN_HAS_ALLOC_MMAP)
-  #include <botan/mmap_mem.h>
+  #include <botan/internal/mmap_mem.h>
 #endif
 
 #if defined(BOTAN_HAS_ENGINE_IA32_ASSEMBLER)
diff --git a/src/libstate/oid_lookup/info.txt b/src/libstate/oid_lookup/info.txt
index e0f6f099c..6544c9501 100644
--- a/src/libstate/oid_lookup/info.txt
+++ b/src/libstate/oid_lookup/info.txt
@@ -1,12 +1,5 @@
-load_on dep
-
 define OID_LOOKUP
 
-<add>
-oids.cpp
-oids.h
-</add>
-
 <requires>
 asn1
 </requires>
diff --git a/src/libstate/scan_name.cpp b/src/libstate/scan_name.cpp
index e16ffbcfe..9e046e8ea 100644
--- a/src/libstate/scan_name.cpp
+++ b/src/libstate/scan_name.cpp
@@ -1,6 +1,6 @@
 /**
 * SCAN Name Abstraction
-* (C) 2008 Jack Lloyd
+* (C) 2008-2009 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
 */