From 12afeca214c4414a0ced0bc4654d0fc5908dc77b Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Wed, 16 Dec 2009 02:22:58 +0000
Subject: Make many more headers internal-only.

Fixes for the amalgamation generator for internal headers.

Remove BOTAN_DLL exporting macros from all internal-only headers;
the classes/functions there don't need to be exported, and
avoiding the PIC/GOT indirection can be a big win.

Add missing BOTAN_DLLs where necessary, mostly gfpmath and cvc

For GCC, use -fvisibility=hidden and set BOTAN_DLL to the
visibility __attribute__ to export those classes/functions.
---
 src/alloc/mem_pool/info.txt     | 9 +++++++++
 src/alloc/mem_pool/mem_pool.cpp | 4 ++--
 src/alloc/mem_pool/mem_pool.h   | 6 +++---
 3 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'src/alloc/mem_pool')

diff --git a/src/alloc/mem_pool/info.txt b/src/alloc/mem_pool/info.txt
index 6cb221834..5097c325f 100644
--- a/src/alloc/mem_pool/info.txt
+++ b/src/alloc/mem_pool/info.txt
@@ -1,3 +1,12 @@
+
+<source>
+mem_pool.cpp
+</source>
+
+<header:internal>
+mem_pool.h
+</header:internal>
+
 <requires>
 mutex
 </requires>
diff --git a/src/alloc/mem_pool/mem_pool.cpp b/src/alloc/mem_pool/mem_pool.cpp
index e30a7b98a..2945a4cef 100644
--- a/src/alloc/mem_pool/mem_pool.cpp
+++ b/src/alloc/mem_pool/mem_pool.cpp
@@ -7,8 +7,8 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/mem_pool.h>
-#include <botan/rounding.h>
+#include <botan/internal/mem_pool.h>
+#include <botan/internal/rounding.h>
 #include <botan/mem_ops.h>
 #include <algorithm>
 #include <exception>
diff --git a/src/alloc/mem_pool/mem_pool.h b/src/alloc/mem_pool/mem_pool.h
index 51571405e..9735a547d 100644
--- a/src/alloc/mem_pool/mem_pool.h
+++ b/src/alloc/mem_pool/mem_pool.h
@@ -10,7 +10,7 @@
 
 #include <botan/allocate.h>
 #include <botan/exceptn.h>
-#include <botan/mutex.h>
+#include <botan/internal/mutex.h>
 #include <utility>
 #include <vector>
 
@@ -19,7 +19,7 @@ namespace Botan {
 /*
 * Pooling Allocator
 */
-class BOTAN_DLL Pooling_Allocator : public Allocator
+class Pooling_Allocator : public Allocator
    {
    public:
       void* allocate(u32bit);
@@ -36,7 +36,7 @@ class BOTAN_DLL Pooling_Allocator : public Allocator
       virtual void* alloc_block(u32bit) = 0;
       virtual void dealloc_block(void*, u32bit) = 0;
 
-      class BOTAN_DLL Memory_Block
+      class Memory_Block
          {
          public:
             Memory_Block(void*);
-- 
cgit v1.2.3