Mercurial > hg > xemacs-beta
diff modules/postgresql/postgresql.c @ 5118:e0db3c197671 ben-lisp-object
merge up to latest default branch, doesn't compile yet
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sat, 26 Dec 2009 21:18:49 -0600 |
| parents | 3742ea8250b5 6ef4efc5cfe0 |
| children | d1247f3cc363 |
line wrap: on
line diff
--- a/modules/postgresql/postgresql.c Sat Dec 26 00:20:27 2009 -0600 +++ b/modules/postgresql/postgresql.c Sat Dec 26 21:18:49 2009 -0600 @@ -3,8 +3,8 @@ Copyright (C) 2000 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. - Author: SL Baur <steve@beopen.com> - Maintainer: SL Baur <steve@beopen.com> + Author: SL Baur <steve@xemacs.org> + Maintainer: SL Baur <steve@xemacs.org> Please send patches to this file to me first before submitting them to xemacs-patches. @@ -240,9 +240,11 @@ #ifdef RUNNING_XEMACS_21_1 Lisp_PGconn *pgconn = ALLOC_LCRECORD_TYPE (Lisp_PGconn, lrecord_pgconn); -#else +#elif RUNNING_XEMACS_21_4 Lisp_PGconn *pgconn = ALLOC_LCRECORD_TYPE (Lisp_PGconn, &lrecord_pgconn); +#else + Lisp_PGconn *pgconn = XPGCONN (ALLOC_LISP_OBJECT (pgconn)); #endif pgconn->pgconn = (PGconn *)NULL; return pgconn; @@ -266,7 +268,7 @@ #ifdef RUNNING_XEMACS_21_1 DEFINE_LRECORD_IMPLEMENTATION ("pgconn", pgconn, - 2mark_pgconn, print_pgconn, finalize_pgconn, + mark_pgconn, print_pgconn, finalize_pgconn, NULL, NULL, Lisp_PGconn); #elif defined (RUNNING_XEMACS_21_4) @@ -277,12 +279,12 @@ pgconn_description, Lisp_PGconn); #else -DEFINE_NONDUMPABLE_LRECORD_IMPLEMENTATION ("pgconn", pgconn, - mark_pgconn, print_pgconn, - finalize_pgconn, - NULL, NULL, - pgconn_description, - Lisp_PGconn); +DEFINE_NODUMP_LISP_OBJECT ("pgconn", pgconn, + mark_pgconn, print_pgconn, + finalize_pgconn, + NULL, NULL, + pgconn_description, + Lisp_PGconn); #endif /****/ @@ -372,9 +374,11 @@ #ifdef RUNNING_XEMACS_21_1 Lisp_PGresult *pgresult = ALLOC_LCRECORD_TYPE (Lisp_PGresult, lrecord_pgresult); -#else +#elif RUNNING_XEMACS_21_4 Lisp_PGresult *pgresult = ALLOC_LCRECORD_TYPE (Lisp_PGresult, &lrecord_pgresult); +#else + Lisp_PGresult *pgresult = XPGRESULT (ALLOC_LISP_OBJECT (pgresult)); #endif pgresult->pgresult = (PGresult *)NULL; return pgresult; @@ -401,13 +405,19 @@ mark_pgresult, print_pgresult, finalize_pgresult, NULL, NULL, Lisp_PGresult); -#else +#elif defined (RUNNING_XEMACS_21_4) DEFINE_LRECORD_IMPLEMENTATION ("pgresult", pgresult, 0, /*dumpable-flag*/ mark_pgresult, print_pgresult, finalize_pgresult, NULL, NULL, pgresult_description, Lisp_PGresult); +#else +DEFINE_NODUMP_LISP_OBJECT ("pgresult", pgresult, + mark_pgresult, print_pgresult, finalize_pgresult, + NULL, NULL, + pgresult_description, + Lisp_PGresult); #endif /***********************/ @@ -1606,8 +1616,8 @@ syms_of_postgresql(void) { #ifndef RUNNING_XEMACS_21_1 - INIT_LRECORD_IMPLEMENTATION (pgconn); - INIT_LRECORD_IMPLEMENTATION (pgresult); + INIT_LISP_OBJECT (pgconn); + INIT_LISP_OBJECT (pgresult); #endif DEFSYMBOL (Qpostgresql);