[svn-upgrade] Integrating new upstream version, ion3 (20071220)

[ion3.git] / ioncore / pholder.h

diff --git a/ioncore/pholder.h b/ioncore/pholder.h
index b2b4986a1e365d75dca1ff7642c3dec75f73a5bd..4d07f16be01b75fbf3aeb604048e1b8ffe4e2a8f 100644 (file)
--- a/ioncore/pholder.h
+++ b/ioncore/pholder.h
@@ -21,7 +21,6 @@
 
 DECLCLASS(WPHolder){
     Obj obj;
-    WPHolder *redirect;
 };
 
 
@@ -42,11 +41,7 @@ DYNFUN WRegion *pholder_do_target(WPHolder *ph);
 
 extern WRegion *pholder_target(WPHolder *ph);
 
-extern WPHolder *pholder_do_root(WPHolder *ph);
-
-extern WPHolder *pholder_root(WPHolder *ph);
-
-extern bool pholder_stale(WPHolder *ph);
+DYNFUN bool pholder_stale(WPHolder *ph);
 
 DYNFUN bool pholder_do_check_reparent(WPHolder *ph, WRegion *reg);
 
@@ -56,8 +51,6 @@ DYNFUN bool pholder_do_goto(WPHolder *ph);
 
 extern bool pholder_goto(WPHolder *ph);
 
-extern bool pholder_redirect(WPHolder *ph, WRegion *old_target);
-
 extern WPHolder *pholder_either(WPHolder *a, WPHolder *b);
 
 DYNFUN WPHolder *region_managed_get_pholder(WRegion *reg, WRegion *mgd);