-CORBA_Environment *cspi_ev (void);
-SPIBoolean cspi_exception (void);
-Accessibility_Registry cspi_registry (void);
-Accessible *cspi_object_add (CORBA_Object corba_object);
-Accessible *cspi_object_add_check (CORBA_Object corba_object);
-void cspi_object_ref (Accessible *accessible);
-void cspi_object_unref (Accessible *accessible);
-SPIBoolean cspi_accessible_is_a (Accessible *obj,
- const char *interface_name);
-SPIBoolean cspi_warn_ev (CORBA_Environment *ev,
- const char *error_string);
-void cspi_check_ev (CORBA_Environment *ev,
- const char *error_string);
+CORBA_Environment *cspi_ev (void);
+CORBA_Environment *cspi_peek_ev (void);
+SPIBoolean cspi_exception (void);
+Accessibility_Registry cspi_registry (void);
+Accessible *cspi_object_add (CORBA_Object corba_object);
+void cspi_object_ref (Accessible *accessible);
+void cspi_object_unref (Accessible *accessible);
+Accessible *cspi_object_borrow (CORBA_Object corba_object);
+Accessible *cspi_object_take (CORBA_Object corba_object);
+void cspi_object_return (Accessible *accessible);
+SPIBoolean cspi_accessible_is_a (Accessible *accessible,
+ const char *interface_name);
+AccessibleRole cspi_role_from_spi_role (Accessibility_Role role);
+void cspi_streams_close_all (void);
+gboolean cspi_exception_throw (CORBA_Environment *ev, char *desc_prefix);
+
+AccessibleAttributeSet
+ *_cspi_attribute_set_from_sequence (const Accessibility_AttributeSet *seq);
+#define cspi_return_if_fail(val) \
+ if (!(val)) \
+ return
+#define cspi_return_val_if_fail(val, ret) \
+ if (!(val)) \
+ return (ret)
+
+#define cspi_return_if_ev(err) \
+ if (!cspi_check_ev (err)) \
+ return;
+#define cspi_return_val_if_ev(err, ret) \
+ if (!cspi_check_ev (err)) \
+ return (ret);