| bonobo-activation-version.h | bonobo-activation-version.h | |||
|---|---|---|---|---|
| skipping to change at line 27 | skipping to change at line 27 | |||
| * You should have received a copy of the GNU Library General Public | * You should have received a copy of the GNU Library General Public | |||
| * License along with this library; if not, write to the Free | * License along with this library; if not, write to the Free | |||
| * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | |||
| * | * | |||
| * Author: Elliot Lee <sopwith@redhat.com> | * Author: Elliot Lee <sopwith@redhat.com> | |||
| */ | */ | |||
| #ifndef BONOBO_ACTIVATION_VERSION_H | #ifndef BONOBO_ACTIVATION_VERSION_H | |||
| #define BONOBO_ACTIVATION_VERSION_H | #define BONOBO_ACTIVATION_VERSION_H | |||
| #define BONOBO_ACTIVATION_MAJOR_VERSION (2) | #define BONOBO_ACTIVATION_MAJOR_VERSION (2) | |||
| #define BONOBO_ACTIVATION_MINOR_VERSION (21) | #define BONOBO_ACTIVATION_MINOR_VERSION (22) | |||
| #define BONOBO_ACTIVATION_MICRO_VERSION (90) | #define BONOBO_ACTIVATION_MICRO_VERSION (0) | |||
| #endif /* BONOBO_ACTIVATION_VERSION_H */ | #endif /* BONOBO_ACTIVATION_VERSION_H */ | |||
| End of changes. 1 change blocks. | ||||
| 2 lines changed or deleted | 2 lines changed or added | |||
| bonobo-exception.h | bonobo-exception.h | |||
|---|---|---|---|---|
| skipping to change at line 80 | skipping to change at line 80 | |||
| G_LOG_LEVEL_CRITICAL, \ | G_LOG_LEVEL_CRITICAL, \ | |||
| "file %s: line %d (%s): assertion `%s' failed.", \ | "file %s: line %d (%s): assertion `%s' failed.", \ | |||
| __FILE__, \ | __FILE__, \ | |||
| __LINE__, \ | __LINE__, \ | |||
| G_STRFUNC, \ | G_STRFUNC, \ | |||
| #expr); \ | #expr); \ | |||
| return val; \ | return val; \ | |||
| }; }G_STMT_END | }; }G_STMT_END | |||
| #endif | #endif | |||
| #define BONOBO_EX(ev) ((ev) && (ev)->_major != CORBA_NO_EXCEPTION) | #define BONOBO_EX(ev) ((ev) != NULL && (ev)->_major != CORBA_NO_EXC EPTION) | |||
| #define BONOBO_USER_EX(ev,id) ((ev) && (ev)->_major == CORBA_USER_EXCEPTION && \ | #define BONOBO_USER_EX(ev,id) ((ev != NULL) && (ev)->_major == CORBA_USER_E XCEPTION && \ | |||
| (ev)->_id != NULL && !strcmp ((ev)->_id, id)) | (ev)->_id != NULL && !strcmp ((ev)->_id, id)) | |||
| #define BONOBO_EX_REPOID(ev) (ev)->_id | #define BONOBO_EX_REPOID(ev) (ev)->_id | |||
| #define BONOBO_RET_EX(ev) \ | #define BONOBO_RET_EX(ev) \ | |||
| G_STMT_START{ \ | G_STMT_START{ \ | |||
| if (BONOBO_EX (ev)) \ | if (BONOBO_EX (ev)) \ | |||
| return; \ | return; \ | |||
| }G_STMT_END | }G_STMT_END | |||
| End of changes. 2 change blocks. | ||||
| 2 lines changed or deleted | 2 lines changed or added | |||