diff --git a/pjsip-apps/build/Makefile b/pjsip-apps/build/Makefile
index dfcadb6..d57228a 100644
--- a/pjsip-apps/build/Makefile
+++ b/pjsip-apps/build/Makefile
@@ -92,7 +92,7 @@
 	$(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $@
 	$(MAKE) -f $(RULES_MAK) APP=PJSIPPERF app=pjsip-perf $@
 	$(MAKE) -f Samples.mak $@
-	@if test "$@" == "depend"; then \
+	@if test "$@" = "depend"; then \
 	  echo '$(PJSUA_EXE): $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE) $(PJSUA_LIB_LIB) $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB) Makefile' >> .pjsua-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \
 	  echo '$(PJSIPPERF_EXE): $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE) $(PJSUA_LIB_LIB) $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB)' >> .pjsip-perf-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \
 	fi
diff --git a/pjsip-apps/src/pjsua/main.c b/pjsip-apps/src/pjsua/main.c
index 3e6339d..3c7e2fd 100644
--- a/pjsip-apps/src/pjsua/main.c
+++ b/pjsip-apps/src/pjsua/main.c
@@ -317,7 +317,7 @@
     len = strlen(buf);
 
     /* Left trim */
-    while (isspace(*buf)) {
+    while (pj_isspace(*buf)) {
 	++buf;
 	--len;
     }
@@ -329,7 +329,7 @@
     if (len == 0 || buf[0]=='q')
 	return;
 
-    if (isdigit(*buf) || *buf=='-') {
+    if (pj_isdigit(*buf) || *buf=='-') {
 	
 	int i;
 	
@@ -339,7 +339,7 @@
 	    i = 0;
 
 	for (; i<len; ++i) {
-	    if (!isdigit(buf[i])) {
+	    if (!pj_isdigit(buf[i])) {
 		puts("Invalid input");
 		return;
 	    }