[PATCH] Re: cvs-1.11.0-1 fails to build

[Igor Pechtchanski]

On Sun, 20 Oct 2002, Igor Pechtchanski wrote:

> On Sun, 20 Oct 2002, Max Bowsher wrote:
>
> > Igor Pechtchanski <pechtcha@cs.nyu.edu> wrote:
> > >> I'm having a problem building cvs-1.11.0-1.  GDBM_EXPORT is not
> > >> picked up as a macro (which I assume it is, as it's used to declare
> > >> functions), and this results in parse errors and gcc being generally
> > >> unhappy.  I'm attaching the exact error message.
> > >> This is probably because I have gdbm-1.8.0-4, and cvs lists
> > >> gdbm-1.8.0-3 in its dependences, although Chuck Wilson apparently
> > >> received no complaints during the test period (
> > >> http://www.cygwin.com/ml/cygwin/2002-02/msg01333.html ).
> >
> > I ran into this problem, and solved it by backing out Chuck's gdbm changes,
> > instead building cvs in its flat-file mode. I needed to do this so I had a
> > cvs which could act on repositories created using this method.
> >
> > [snip]
> >
> > Attatched is Chuck's patch as included in the Cygwin source package, spilt
> > into 2: cygupdate is general fixups, and gdbmify is the gdbm additions,
> > which I backed out to build a cvs_flatdbm.exe which I keep in ~/bin.
> > Max.
>
> [snip]
>
> When I have some time, I'll look into patching cvs to build with the new
> gdbm...

Attached is a patch to cvs that lets it build with the current version of
gdbm.
	Igor

ChangeLog:
2002-10-20  Igor Pechtchanski <pechtcha@cs.nyu.edu>

	* mygdbm.h: Remove macro from declarations of dbm_close, dbm_fetch,
	dbm_store, dbm_delete, dbm_firstkey, dbm_nextkey.

-- 
				http://cs.nyu.edu/~pechtcha/
      |\      _,,,---,,_		pechtcha@cs.nyu.edu
ZZZzz /,`.-'`'    -.  ;-;;,_		igor@watson.ibm.com
     |,4-  ) )-,_. ,\ (  `'-'		Igor Pechtchanski
    '---''(_/--'  `-'\_) fL	a.k.a JaguaR-R-R-r-r-r-.-.-.  Meow!

"Water molecules expand as they grow warmer" (C) Popular Science, Oct'02, p.51
-------------- next part --------------
--- ./src/mygdbm.h	2002-10-20 14:44:40.000000000 -0400
+++ ./src/mygdbm.h-orig	2002-10-20 14:44:35.000000000 -0400
@@ -13,12 +13,12 @@
 
 /* definitions copied from ndbm.h */
 typedef struct {int dummy[10];} DBM;
-extern void __cdecl dbm_close();
-extern datum __cdecl dbm_fetch();
-extern int __cdecl dbm_store();
-extern int __cdecl dbm_delete();
-extern datum __cdecl dbm_firstkey();
-extern datum __cdecl dbm_nextkey();
+extern GDBM_EXPORT(void,        dbm_close) ();
+extern GDBM_EXPORT(datum,       dbm_fetch) ();
+extern GDBM_EXPORT(int,         dbm_store) ();
+extern GDBM_EXPORT(int,         dbm_delete) ();
+extern GDBM_EXPORT(datum,       dbm_firstkey) ();
+extern GDBM_EXPORT(datum,       dbm_nextkey) ();
 
 DBM * my_gdbm_open PROTO((char *file, int flags, int mode));
 #endif 			/* USE_GDBM && !MY_NDBM */
-------------- next part --------------
--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/