From f57991285fadd77c5d443a4bfa103aef955a7c0c Mon Sep 17 00:00:00 2001
From: Sylvain Pion <Sylvain.Pion@sophia.inria.fr>
Date: Tue, 12 Feb 2002 09:14:20 +0000
Subject: [PATCH] - Put cgal_logo within namespace CGAL.

---
 Packages/window/changes.txt                 | 3 +++
 Packages/window/include/CGAL/IO/cgal_logo.h | 6 +++++-
 Packages/window/src/cgal_logo.C             | 6 ++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Packages/window/changes.txt b/Packages/window/changes.txt
index c14ac627c9c..4db7efc615a 100644
--- a/Packages/window/changes.txt
+++ b/Packages/window/changes.txt
@@ -1,3 +1,6 @@
+2.8.22 (12 Feb 2002)
+- Put cgal_logo within namespace CGAL.
+
 2.8.21 (16 Jan 2002)
 - casts added to create_demo_window and create_and_display_demo_window 
   functions in leda_window.h to avoid warnings
diff --git a/Packages/window/include/CGAL/IO/cgal_logo.h b/Packages/window/include/CGAL/IO/cgal_logo.h
index 683348ec28f..fa335f9c6d1 100644
--- a/Packages/window/include/CGAL/IO/cgal_logo.h
+++ b/Packages/window/include/CGAL/IO/cgal_logo.h
@@ -23,10 +23,14 @@
 #ifndef CGAL_LOGO_H
 #define CGAL_LOGO_H
 
+CGAL_BEGIN_NAMESPACE
+
 #if !defined(__LEDA__) || (__LEDA__ > 400)
 extern const char * cgal_logo[];
 #else
 extern char * cgal_logo[];
 #endif // __LEDA__
 
-#endif // CGAL_LOGO_XPM_H
+CGAL_END_NAMESPACE
+
+#endif // CGAL_LOGO_H
diff --git a/Packages/window/src/cgal_logo.C b/Packages/window/src/cgal_logo.C
index eee1775a4c2..d830cd6e6c9 100644
--- a/Packages/window/src/cgal_logo.C
+++ b/Packages/window/src/cgal_logo.C
@@ -20,6 +20,11 @@
 // coordinator   : MPI, Saarbruecken 
 // ============================================================================
 /* XPM */
+
+#include <CGAL/basic.h>
+
+CGAL_BEGIN_NAMESPACE
+
 #if !defined(__LEDA__) || (__LEDA__ > 400)
 const char * cgal_logo[] = {
 #else
@@ -92,3 +97,4 @@ char * cgal_logo[] = {
 ".............................................................",
 "............................................................."};
 
+CGAL_END_NAMESPACE