FreeTDS Development Group

["Castellano, Nicholas" <Nicholas_Castellano AT acml.com>]

Jim,

It appears that you got a conflict when you last updated from CVS, and you
didn't resolve it properly.

Change to the top-level directory and do this:

rm include/replacements.h
rm src/replacements/atoll.c
cvs update

If you get any other conflicts during the update ("C" in the status column)
remove those and repeat the update.

Then try rebuilding, it should be fine (I did test the atoll changes over
the weekend).

Cheers,
--nick

-----Original Message-----
From: bounce-freetds-145195 AT franklin.oit.unc.edu
[mailto:bounce-freetds-145195 AT franklin.oit.unc.edu]
Sent: Monday, October 14, 2002 7:46 PM
To: TDS Development Group
Subject: [freetds] Re: atoll.c does not make


Replying to self, always fun.  

My files look like this now:

        replacements.h:

#if !HAVE_ATOLL
typedef long long  atoll_return_t;
atoll_return_t atoll(const char *nptr);
#endif /* !HAVE_ATOLL */

        atoll.c:

atoll_return_t
atoll(const char *nptr)
{
        return atol(nptr);
}

IOW, I changed the return type in atoll.c.  Say if you want this
committed.  

--jkl
        


On Mon, 14 Oct 2002 19:32:19 -0400, "James K. Lowden"
<jklowden AT schemamania.org> wrote:
> Hi Nick, 
> 
> One advantage, as it were, to running a stone age OS is that it might
> flush out things that you wouldn't otherwise trip over.  
> 
> Making all in replacements
> gmake[2]: Entering directory
> `/usr/local/website/DocumentRoot/projects/freetds/src/replacements'
> source='atoll.c' object='atoll.lo' libtool=yes \
> depfile='.deps/atoll.Plo' tmpdepfile='.deps/atoll.TPlo' \
> depmode=gcc /usr/local/bin/bash ../../depcomp \
> /usr/local/bin/bash ../../libtool --mode=compile gcc -DHAVE_CONFIG_H -I.
> -I. -I../../include -I../../include  -I/usr/pkg/include 
> -D_FREETDS_LIBRARY_SOURCE -DTDS50 -c -o atoll.lo `test -f 'atoll.c' ||
> echo './'`atoll.c
> gcc -DHAVE_CONFIG_H -I. -I. -I../../include -I../../include
> -I/usr/pkg/include -D_FREETDS_LIBRARY_SOURCE -DTDS50 -c atoll.c
> -Wp,-MD,.deps/atoll.TPlo  -fPIC -DPIC -o .libs/atoll.o
> atoll.c:28: syntax error before `atoll'
> atoll.c:29: conflicting types for `atoll'
> ../../include/replacements.h:45: previous declaration of `atoll'
> gmake[2]: *** [atoll.lo] Error 1
> 
> I do indeed need an atoll() on my NetBSD 1.4.2 machine.  I think the
> problem might be:
> 
>       replacements.h:
> #if !HAVE_ATOLL
> typedef long long atoll_return_t;
> atoll_return_t atoll(const char *nptr);
> #endif /* !HAVE_ATOLL */
> 
>       but the definition of the function is slightly different:
> 
> tds_sysdep_int64_type
> atoll(const char *nptr)
> {
>       return atol(nptr);
> }
> 
>       even though they're pretty much the same thing:
> 
> $ grep tds_sysdep_int64 include/*.h
> include/tds_sysdep_public.h:#define tds_sysdep_int64_type long long     
>  
>              /* 64-bit int */
> include/tds_sysdep_public.h:#ifndef tds_sysdep_int64_type
> include/tds_sysdep_public.h:#define tds_sysdep_int64_type long long    
> /* 64-bit int */
> include/tds_sysdep_public.h:#endif /* !tds_sysdep_int64_type */
> 
> 
> I guess the typedef in replacements.h should be 
> 
>       typedef tds_sysdep_int64_type atoll_return_t;
> 
> Is that what you had in mind?
> 
> --jkl
> 
> 
> 
> ---
> You are currently subscribed to freetds as: [jklowden AT speakeasy.org]
> To unsubscribe, forward this message to
> $subst('Email.Unsub')

---
You are currently subscribed to freetds as: [Nicholas_Castellano AT acml.com]
To unsubscribe, forward this message to
$subst('Email.Unsub')


The information contained in this transmission may contain privileged and
confidential information and is intended only for the use of the person(s)
named above.  If you are not the intended recipient, or an employee or agent
responsible for delivering this message to the intended recipient, any
review, dissemination, distribution or duplication of this communication is
strictly prohibited. If you are not the intended recipient, please contact
the sender immediately by reply e-mail and destroy all copies of the
original message. Please note that for certain accounts we do not accept
orders and/or instructions by e-mail, and for those accounts we will not be
responsible for carrying out such orders and/or instructions. Kindly refrain
from sending orders or instructions by e-mail unless you have confirmed that
we accept such communications for your account. Please also note that to
satisfy regulatory requirements we review the outgoing and incoming e-mail
correspondence of staff members serving certain functions.