This ocurrs when you have committed lf.only files from a Windows
machine.. cvs fools the files trying to cut down the cr.. and everything
goes bad from that point..
I use every day WinCVS without problems.. letting cvs do the
transformations by itself..
Saludos ,
Ignacio J. Ortega
> -----Mensaje original-----
> De: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
> Enviado el: viernes 29 de junio de 2001 9:33
> Para: [EMAIL PROTECTED]
> Asunto: cvs commit:
> jakarta-tomcat-connectors/jk/native/domino config.h
>
>
> andya 01/06/29 00:33:14
>
> Modified: jk/native/domino config.h
> Log:
> Yet more line ending funkiness. Anyone else have this with WinCVS?
>
> Revision Changes Path
> 1.7 +99 -94
> jakarta-tomcat-connectors/jk/native/domino/config.h
>
> Index: config.h
> ===================================================================
> RCS file:
> /home/cvs/jakarta-tomcat-connectors/jk/native/domino/config.h,v
> retrieving revision 1.6
> retrieving revision 1.7
> diff -u -r1.6 -r1.7
> --- config.h 2001/06/25 08:32:34 1.6
> +++ config.h 2001/06/29 07:33:12 1.7
> @@ -1,94 +1,99 @@
> -/*
> ==============================================================
> =========== *
> - *
> *
> - * The Apache Software License, Version
> 1.1 *
> - *
> *
> - * Copyright (c) 1999-2001 The Apache Software
> Foundation. *
> - * All rights reserved.
> *
> - *
> *
> - *
> ==============================================================
> =========== *
> - *
> *
> - * Redistribution and use in source and binary forms,
> with or without modi- *
> - * fication, are permitted provided that the following
> conditions are met: *
> - *
> *
> - * 1. Redistributions of source code must retain the
> above copyright notice *
> - * notice, this list of conditions and the following
> disclaimer. *
> - *
> *
> - * 2. Redistributions in binary form must reproduce
> the above copyright *
> - * notice, this list of conditions and the following
> disclaimer in the *
> - * documentation and/or other materials provided with
> the distribution. *
> - *
> *
> - * 3. The end-user documentation included with the
> redistribution, if any, *
> - * must include the following acknowlegement:
> *
> - *
> *
> - * "This product includes software developed by
> the Apache Software *
> - * Foundation <http://www.apache.org/>."
> *
> - *
> *
> - * Alternately, this acknowlegement may appear in the
> software itself, if *
> - * and wherever such third-party acknowlegements
> normally appear. *
> - *
> *
> - * 4. The names "The Jakarta Project", "Jk", and
> "Apache Software *
> - * Foundation" must not be used to endorse or promote
> products derived *
> - * from this software without prior written
> permission. For written *
> - * permission, please contact <[EMAIL PROTECTED]>.
> *
> - *
> *
> - * 5. Products derived from this software may not be
> called "Apache" nor may *
> - * "Apache" appear in their names without prior written
> permission of the *
> - * Apache Software Foundation.
> *
> - *
> *
> - * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR
> IMPLIED WARRANTIES *
> - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
> OF MERCHANTABILITY *
> - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
> IN NO EVENT SHALL *
> - * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS
> BE LIABLE FOR ANY *
> - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
> OR CONSEQUENTIAL *
> - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
> OF SUBSTITUTE GOODS *
> - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
> BUSINESS INTERRUPTION) *
> - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
> WHETHER IN CONTRACT, *
> - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
> OTHERWISE) ARISING IN *
> - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
> IF ADVISED OF THE *
> - * POSSIBILITY OF SUCH DAMAGE.
> *
> - *
> *
> - *
> ==============================================================
> =========== *
> - *
> *
> - * This software consists of voluntary contributions
> made by many indivi- *
> - * duals on behalf of the Apache Software Foundation.
> For more information *
> - * on the Apache Software Foundation, please see
> <http://www.apache.org/>. *
> - *
> *
> - *
> ==============================================================
> =========== */
> -
>
> -/************************************************************
> ***************
> - * Description: DSAPI plugin for Lotus Domino
> *
> - * Author: Andy Armstrong <[EMAIL PROTECTED]>
> *
> - * Version: $Revision: 1.6 $
> *
> -
> **************************************************************
> *************/
> -
> -#ifndef __config_h
> -#define __config_h
> -
> -#define MAKEVERSION(a, b, c, d) \
> - (((a) << 24) + ((b) << 16) + ((c) << 8) + (d))
> -
> -/* the _memicmp() function is available */
> -#if defined(WIN32)
> -
> -#define HAVE_MEMICMP
> -#undef USE_INIFILE
> -
> -#elif defined(LINUX)
> -
> -#undef HAVE_MEMICMP
> -#define USE_INIFILE
> -
> -#else
> -#error Please define either WIN32 or LINUX
> -#endif
> -
> -/* define if you don't have the Notes C API which is available from
> - *
> - * http://www.lotus.com/rw/dlcapi.nsf
> - */
> -/* #undef NO_CAPI */
> -
> -#define DEBUG(args) \
> - do { /*printf args ;*/ } while (0)
> -
> -#endif /* __config_h */
> +/*
> ==============================================================
> =========== *
> + *
> *
> + * The Apache Software License, Version
> 1.1 *
> + *
> *
> + * Copyright (c) 1999-2001 The Apache Software
> Foundation. *
> + * All rights reserved.
> *
> + *
> *
> + *
> ==============================================================
> =========== *
> + *
> *
> + * Redistribution and use in source and binary forms,
> with or without modi- *
> + * fication, are permitted provided that the following
> conditions are met: *
> + *
> *
> + * 1. Redistributions of source code must retain the
> above copyright notice *
> + * notice, this list of conditions and the following
> disclaimer. *
> + *
> *
> + * 2. Redistributions in binary form must reproduce
> the above copyright *
> + * notice, this list of conditions and the following
> disclaimer in the *
> + * documentation and/or other materials provided with
> the distribution. *
> + *
> *
> + * 3. The end-user documentation included with the
> redistribution, if any, *
> + * must include the following acknowlegement:
> *
> + *
> *
> + * "This product includes software developed by
> the Apache Software *
> + * Foundation <http://www.apache.org/>."
> *
> + *
> *
> + * Alternately, this acknowlegement may appear in the
> software itself, if *
> + * and wherever such third-party acknowlegements
> normally appear. *
> + *
> *
> + * 4. The names "The Jakarta Project", "Jk", and
> "Apache Software *
> + * Foundation" must not be used to endorse or promote
> products derived *
> + * from this software without prior written
> permission. For written *
> + * permission, please contact <[EMAIL PROTECTED]>.
> *
> + *
> *
> + * 5. Products derived from this software may not be
> called "Apache" nor may *
> + * "Apache" appear in their names without prior written
> permission of the *
> + * Apache Software Foundation.
> *
> + *
> *
> + * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR
> IMPLIED WARRANTIES *
> + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
> OF MERCHANTABILITY *
> + * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
> IN NO EVENT SHALL *
> + * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS
> BE LIABLE FOR ANY *
> + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
> OR CONSEQUENTIAL *
> + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
> OF SUBSTITUTE GOODS *
> + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
> BUSINESS INTERRUPTION) *
> + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
> WHETHER IN CONTRACT, *
> + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
> OTHERWISE) ARISING IN *
> + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
> IF ADVISED OF THE *
> + * POSSIBILITY OF SUCH DAMAGE.
> *
> + *
> *
> + *
> ==============================================================
> =========== *
> + *
> *
> + * This software consists of voluntary contributions
> made by many indivi- *
> + * duals on behalf of the Apache Software Foundation.
> For more information *
> + * on the Apache Software Foundation, please see
> <http://www.apache.org/>. *
> + *
> *
> + *
> ==============================================================
> =========== */
> +
>
> +/************************************************************
> ***************
> + * Description: DSAPI plugin for Lotus Domino
> *
> + * Author: Andy Armstrong <[EMAIL PROTECTED]>
> *
> + * Version: $Revision: 1.7 $
> *
> +
> **************************************************************
> *************/
> +
> +#ifndef __config_h
> +#define __config_h
> +
> +#define MAKEVERSION(a, b, c, d) \
> + (((a) << 24) + ((b) << 16) + ((c) << 8) + (d))
> +
> +/* the _memicmp() function is available */
> +#if defined(WIN32)
> +
> +#define HAVE_MEMICMP
> +#undef USE_INIFILE
> +
> +#elif defined(LINUX)
> +
> +#undef HAVE_MEMICMP
> +#define USE_INIFILE
> +
> +#elif defined(SOLARIS)
> +
> +#undef HAVE_MEMICMP
> +#define USE_INIFILE
> +
> +#else
> +#error Please define one of WIN32, LINUX or SOLARIS
> +#endif
> +
> +/* define if you don't have the Notes C API which is available from
> + *
> + * http://www.lotus.com/rw/dlcapi.nsf
> + */
> +/* #undef NO_CAPI */
> +
> +#define DEBUG(args) \
> + do { /*printf args ;*/ } while (0)
> +
> +#endif /* __config_h */
>
>
>
>
