* device/include/pic16/pic18f*.h: add bit aliases in INTCONbits_t

[fw/sdcc] / device / lib / _strcmp.c

diff --git a/device/lib/_strcmp.c b/device/lib/_strcmp.c
index 1e6121fd7ef69d321eeb8de02602b4f350972268..1e06058e7fcad02b1172e03aa934f0bad2aa2273 100644 (file)
--- a/device/lib/_strcmp.c
+++ b/device/lib/_strcmp.c
@@ -7,34 +7,36 @@
    under the terms of the GNU Library General Public License as published by the
    Free Software Foundation; either version 2, or (at your option) any
    later version.
    under the terms of the GNU Library General Public License as published by the
    Free Software Foundation; either version 2, or (at your option) any
    later version.

-   
+

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU Library General Public License for more details.
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU Library General Public License for more details.

-   
+

    You should have received a copy of the GNU Library General Public License
    along with this program; if not, write to the Free Software
    Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    You should have received a copy of the GNU Library General Public License
    along with this program; if not, write to the Free Software
    Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   
+

    In other words, you are welcome to use, share and improve this program.
    You are forbidden to forbid anyone else to use, share and improve
    In other words, you are welcome to use, share and improve this program.
    You are forbidden to forbid anyone else to use, share and improve

-   what you give them.   Help stamp out software-hoarding!  
+   what you give them.   Help stamp out software-hoarding!

 -------------------------------------------------------------------------*/
 -------------------------------------------------------------------------*/

-#include "string.h" 
+#include "string.h"

 #include <sdcc-lib.h>
 
 #include <sdcc-lib.h>
 

-#define NULL (void *)0
+#if !_SDCC_PORT_PROVIDES_STRCMP

 
 int strcmp (
 
 int strcmp (

-       char _generic   *asrc,
-       char _generic   *adst
+       char * asrc,
+       char * adst

        )
 {
 #if _SDCC_Z80_STYLE_LIB_OPT
        )
 {
 #if _SDCC_Z80_STYLE_LIB_OPT

+#pragma noinduction
+

        char ret = 0 ;
        char ret = 0 ;

-        char _generic *src = asrc;
-        char _generic *dst = adst;
+        char * src = asrc;
+        char * dst = adst;

 
        while( ! (*src - *dst) && *dst)
                ++src, ++dst;
 
        while( ! (*src - *dst) && *dst)
                ++src, ++dst;


@@ -43,14 +45,12 @@ int strcmp (
 #else
        register int ret = 0 ;
 
 #else
        register int ret = 0 ;
 

-       while( ! (ret = *asrc - *adst) && *adst)
+       while( ! (ret = *(unsigned char *)asrc - *(unsigned char *)adst) && *adst)

                ++asrc, ++adst;
 
                ++asrc, ++adst;
 

-       if ( ret < 0 )
-               ret = -1 ;
-       else if ( ret > 0 )
-               ret = 1 ;
-

        return( ret );
 #endif
 }
        return( ret );
 #endif
 }

+
+#endif
+