Enlightenment CVS committal
Author : mej
Project : eterm
Module : libast
Dir : eterm/libast/include
Modified Files:
libast.h
Log Message:
Wed Jul 21 22:48:14 2004 Michael Jennings (mej)
More cleanups and fixed compile problems.
----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/include/libast.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- libast.h 21 Jul 2004 22:17:49 -0000 1.54
+++ libast.h 22 Jul 2004 02:49:50 -0000 1.55
@@ -30,8 +30,8 @@
* including all required system headers and LibAST Object headers.
*
* @author Michael Jennings <[EMAIL PROTECTED]>
- * @version $Revision: 1.54 $
- * @date $Date: 2004/07/21 22:17:49 $
+ * @version $Revision: 1.55 $
+ * @date $Date: 2004/07/22 02:49:50 $
*/
#ifndef _LIBAST_H_
@@ -1332,8 +1332,10 @@
* @see @link DOXGRP_CONF Configuration File Parser @endlink
* @ingroup DOXGRP_CONF
*/
-#define BOOL_OPT_ISTRUE(s) (!strcasecmp((s), true_vals[0]) || !strcasecmp((s),
true_vals[1]) \
- || !strcasecmp((s), true_vals[2]) || !strcasecmp((s),
true_vals[3]))
+#define BOOL_OPT_ISTRUE(s) (!strcasecmp(SPIF_CHARPTR_C(s), true_vals[0]) \
+ || !strcasecmp(SPIF_CHARPTR_C(s), true_vals[1]) \
+ || !strcasecmp(SPIF_CHARPTR_C(s), true_vals[2]) \
+ || !strcasecmp(SPIF_CHARPTR_C(s), true_vals[3]))
/**
* Compares boolean option value to allowed false values.
*
@@ -1345,8 +1347,10 @@
* @see @link DOXGRP_CONF Configuration File Parser @endlink
* @ingroup DOXGRP_CONF
*/
-#define BOOL_OPT_ISFALSE(s) (!strcasecmp((s), false_vals[0]) || !strcasecmp((s),
false_vals[1]) \
- || !strcasecmp((s), false_vals[2]) || !strcasecmp((s),
false_vals[3]))
+#define BOOL_OPT_ISFALSE(s) (!strcasecmp(SPIF_CHARPTR_C(s), false_vals[0]) \
+ || !strcasecmp(SPIF_CHARPTR_C(s), false_vals[1]) \
+ || !strcasecmp(SPIF_CHARPTR_C(s), false_vals[2]) \
+ || !strcasecmp(SPIF_CHARPTR_C(s), false_vals[3]))
/**
* Skip-to-end flag.
@@ -2449,7 +2453,7 @@
* @see @link DOXGRP_OPT Command Line Option Parser @endlink
* @ingroup DOXGRP_OPT
*/
-typedef void (*spifopt_abstract_handler_t)(char *);
+typedef void (*spifopt_abstract_handler_t)(spif_charptr_t);
/**
* Option structure.
@@ -2710,7 +2714,7 @@
#endif
extern spif_charptr_t *spiftool_split(const spif_charptr_t, const spif_charptr_t);
extern spif_charptr_t *spiftool_split_regexp(const spif_charptr_t, const
spif_charptr_t);
-extern spif_charptr_t spiftool_join(const spif_charptr_t, spif_charptr_t *);
+extern spif_charptr_t spiftool_join(spif_charptr_t, spif_charptr_t *);
extern spif_charptr_t spiftool_get_word(unsigned long, const spif_charptr_t);
extern spif_charptr_t spiftool_get_pword(unsigned long, const spif_charptr_t);
extern unsigned long spiftool_num_words(const spif_charptr_t);
@@ -2721,7 +2725,7 @@
extern spif_charptr_t spiftool_safe_str(spif_charptr_t, unsigned short);
extern spif_charptr_t spiftool_condense_whitespace(spif_charptr_t);
extern void spiftool_hex_dump(void *, size_t);
-extern spif_cmp_t spiftool_version_compare(const spif_charptr_t, const
spif_charptr_t);
+extern spif_cmp_t spiftool_version_compare(spif_charptr_t, spif_charptr_t);
#if !(HAVE_MEMMEM)
extern void *memmem(const void *, size_t, const void *, size_t);
#endif
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
