2001-12-10 Michael Meeks <michael@ximian.com>

[platform/core/uifw/at-spi2-atk.git] / cspi / spi-private.h

diff --git a/cspi/spi-private.h b/cspi/spi-private.h
index 118171e..7d0ff20 100644 (file)
--- a/cspi/spi-private.h
+++ b/cspi/spi-private.h
@@ -22,14 +22,24 @@ 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);
+SPIBoolean             cspi_check_ev         (const char          *error_string);
+
+#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);
 
 #endif /* _SPI_PRIVATE_H_ */