[SPTK-CVS] SPTK/src/bin/ds ds.c,1.17,1.18

[Heiga Z. <hei...@us...>]

Update of /cvsroot/sp-tk/SPTK/src/bin/ds
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11613/src/bin/ds

Modified Files:
	ds.c 
Log Message:
Arrange spaces for macros.  Wrap strrchr() by rindex() if string.h does not exist.

Index: ds.c
===================================================================
RCS file: /cvsroot/sp-tk/SPTK/src/bin/ds/ds.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ds.c	9 Oct 2007 09:11:41 -0000	1.17
--- ds.c	16 Oct 2007 02:20:55 -0000	1.18
***************
*** 85,95 ****
  /* Standard C Libraries  */
  #include <stdio.h>
- #include <string.h>
  #include <stdlib.h>
  
  #if defined(WIN32)
! #include "SPTK.h"
  #else
! #include <SPTK.h>
  #endif
  
--- 85,103 ----
  /* Standard C Libraries  */
  #include <stdio.h>
  #include <stdlib.h>
  
+ #ifdef HAVE_STRING_H
+ #  include <string.h>
+ #else
+ #  include <strings.h>
+ #  ifndef HAVE_STRRCHR
+ #     define strrchr rindex
+ #  endif
+ #endif
+ 
  #if defined(WIN32)
! #  include "SPTK.h"
  #else
! #  include <SPTK.h>
  #endif