Changeset 354

Timestamp:

Mar 23, 2006 6:03:40 PM (18 years ago)

Author:

bennylp

Message:

Set default option to exclude pj_stricmp_alnum()

Location:

pjproject/trunk/pjlib

Files:

• build/os-linux.mak (modified) (2 diffs)
• build/os-sunos.mak (modified) (1 diff)
• include/pj/config.h (modified) (1 diff)
• include/pj/string.h (modified) (2 diffs)
• include/pj/string_i.h (modified) (2 diffs)

pjproject/trunk/pjlib/build/os-linux.mak

@@ -8 +8 @@
 # to all operating systems should go in Makefile instead.
 #
-export PJLIB_OBJS +=    addr_resolv_sock.o guid_simple.o \
+export PJLIB_OBJS +=    addr_resolv_sock.o file_access_unistd.o \
+                        file_io_ansi.o guid_simple.o \
                         log_writer_stdout.o os_core_unix.o \
                         os_error_unix.o os_time_unix.o \
                         os_timestamp_common.o os_timestamp_linux.o \
-                        os_time_ansi.o \
                         pool_policy_malloc.o sock_bsd.o sock_select.o
 
@@ -20 +20 @@
 export PJLIB_OBJS += ioqueue_select.o 
 endif
-
-export PJLIB_OBJS += file_access_unistd.o file_io_ansi.o
 
 #

pjproject/trunk/pjlib/build/os-sunos.mak

@@ -8 +8 @@
 # to all operating systems should go in Makefile instead.
 #
-export PJLIB_OBJS +=    addr_resolv_sock.o guid_simple.o \
+export PJLIB_OBJS +=    addr_resolv_sock.o file_access_unistd.o \
+                        file_io_ansi.o guid_simple.o \
                         log_writer_stdout.o os_core_unix.o \
                         os_error_unix.o os_time_unix.o \
                         os_timestamp_common.o os_timestamp_linux.o \
-                        os_time_ansi.o \
                         pool_policy_malloc.o sock_bsd.o sock_select.o
 

pjproject/trunk/pjlib/include/pj/config.h

@@ -366 +366 @@
 
 
+/**
+ * Include pj_stricmp_alnum() and pj_strnicmp_alnum(), i.e. custom
+ * functions to compare alnum strings. On some systems, they're faster
+ * then stricmp/strcasecmp, but they can be slower on other systems.
+ * When disabled, pjlib will fallback to stricmp/strnicmp.
+ * 
+ * Default: 0
+ */
+#ifndef PJ_HAS_STRICMP_ALNUM
+#   define PJ_HAS_STRICMP_ALNUM     0
+#endif
+
+
 /** @} */
 

pjproject/trunk/pjlib/include/pj/string.h

@@ -370 +370 @@
  *      - (-1)      if not equal.
  */
+#if defined(PJ_HAS_STRICMP_ALNUM) && PJ_HAS_STRICMP_ALNUM!=0
 PJ_IDECL(int) strnicmp_alnum(const char *str1, const char *str2,
                              int len);
+#else
+#define strnicmp_alnum  strnicmp
+#endif
 
 /**
@@ -388 +392 @@
  *      - (-1)      if not equal.
  */
+#if defined(PJ_HAS_STRICMP_ALNUM) && PJ_HAS_STRICMP_ALNUM!=0
 PJ_IDECL(int) pj_stricmp_alnum(const pj_str_t *str1, const pj_str_t *str2);
+#else
+#define pj_stricmp_alnum    pj_stricmp
+#endif
 
 /**

pjproject/trunk/pjlib/include/pj/string_i.h

@@ -196 +196 @@
 }
 
+#if defined(PJ_HAS_STRICMP_ALNUM) && PJ_HAS_STRICMP_ALNUM!=0
 PJ_IDEF(int) strnicmp_alnum( const char *str1, const char *str2,
                              int len)
@@ -264 +265 @@
     }
 }
+#endif  /* PJ_HAS_STRICMP_ALNUM */
 
 PJ_IDEF(int) pj_stricmp2( const pj_str_t *str1, const char *str2)