Renamed getopt() to pj_getopt(), and fixed misc Linux warnings

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@300 74dad513-b988-da41-8d7b-12977e46ad98

6 files changed, 190 insertions, 190 deletions

diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile
index 1c546054..09ebcfbf 100644
--- a/pjsip/build/Makefile
+++ b/pjsip/build/Makefile
@@ -70,8 +70,8 @@ export PJSIP_SIMPLE_CFLAGS += $(_CFLAGS)
 #
 export PJSUA_LIB_SRCDIR = ../src/pjsua-lib
 export PJSUA_LIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
-			pjsua_call.o pjsua_core.o pjsua_im.o pjsua_pres.o pjsua_reg.o \
-			pjsua_settings.o \
+			getopt.o pjsua_call.o pjsua_core.o pjsua_im.o \
+			pjsua_pres.o pjsua_reg.o pjsua_settings.o \
 			
 export PJSUA_LIB_CFLAGS += $(_CFLAGS)
 
diff --git a/pjsip/include/pjsua-lib/getopt.h b/pjsip/include/pjsua-lib/getopt.h
index ea19c718..bb8c673e 100644
--- a/pjsip/include/pjsua-lib/getopt.h
+++ b/pjsip/include/pjsua-lib/getopt.h
@@ -1,6 +1,6 @@
 /* $Id$ */
 /* This file has now become GPL. */
-/* Declarations for getopt.
+/* Declarations for pj_getopt.
    Copyright (C) 1989,90,91,92,93,94,96,97,98 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -19,47 +19,47 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#ifndef _GETOPT_H
-#define _GETOPT_H 1
+#ifndef __PJ_GETOPT_H__
+#define __PJ_GETOPT_H__ 1
 
 #ifdef	__cplusplus
 extern "C" {
 #endif
 
-/* For communication from `getopt' to the caller.
-   When `getopt' finds an option that takes an argument,
+/* For communication from `pj_getopt' to the caller.
+   When `pj_getopt' finds an option that takes an argument,
    the argument value is returned here.
    Also, when `ordering' is RETURN_IN_ORDER,
    each non-option ARGV-element is returned here.  */
 
-extern char *optarg;
+extern char *pj_optarg;
 
 /* Index in ARGV of the next element to be scanned.
    This is used for communication to and from the caller
-   and for communication between successive calls to `getopt'.
+   and for communication between successive calls to `pj_getopt'.
 
-   On entry to `getopt', zero means this is the first call; initialize.
+   On entry to `pj_getopt', zero means this is the first call; initialize.
 
-   When `getopt' returns -1, this is the index of the first of the
+   When `pj_getopt' returns -1, this is the index of the first of the
    non-option elements that the caller should itself scan.
 
-   Otherwise, `optind' communicates from one call to the next
+   Otherwise, `pj_optind' communicates from one call to the next
    how much of ARGV has been scanned so far.  */
 
-extern int optind;
+extern int pj_optind;
 
-/* Callers store zero here to inhibit the error message `getopt' prints
+/* Callers store zero here to inhibit the error message `pj_getopt' prints
    for unrecognized options.  */
 
-extern int opterr;
+extern int pj_opterr;
 
 /* Set to an option character which was unrecognized.  */
 
-extern int optopt;
+extern int pj_optopt;
 
 /* Describe the long-named options requested by the application.
-   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
-   of `struct option' terminated by an element containing a name which is
+   The LONG_OPTIONS argument to pj_getopt_long or pj_getopt_long_only is a vector
+   of `struct pj_getopt_option' terminated by an element containing a name which is
    zero.
 
    The field `has_arg' is:
@@ -72,13 +72,13 @@ extern int optopt;
    left unchanged if the option is not found.
 
    To have a long-named option do something other than set an `int' to
-   a compiled-in constant, such as set a value from `optarg', set the
+   a compiled-in constant, such as set a value from `pj_optarg', set the
    option's `flag' field to zero and its `val' field to a nonzero
    value (the equivalent single-letter option character, if there is
-   one).  For long options that have a zero `flag' field, `getopt'
+   one).  For long options that have a zero `flag' field, `pj_getopt'
    returns the contents of the `val' field.  */
 
-struct option
+struct pj_getopt_option
 {
   const char *name;
   /* has_arg can't be an enum because some compilers complain about
@@ -88,7 +88,7 @@ struct option
   int val;
 };
 
-/* Names for the values of the `has_arg' field of `struct option'.  */
+/* Names for the values of the `has_arg' field of `struct pj_getopt_option'.  */
 
 # define no_argument		0
 # define required_argument	1
@@ -101,36 +101,36 @@ struct option
 
    Return the option character from OPTS just read.  Return -1 when
    there are no more options.  For unrecognized options, or options
-   missing arguments, `optopt' is set to the option letter, and '?' is
+   missing arguments, `pj_optopt' is set to the option letter, and '?' is
    returned.
 
    The OPTS string is a list of characters which are recognized option
    letters, optionally followed by colons, specifying that that letter
-   takes an argument, to be placed in `optarg'.
+   takes an argument, to be placed in `pj_optarg'.
 
    If a letter in OPTS is followed by two colons, its argument is
-   optional.  This behavior is specific to the GNU `getopt'.
+   optional.  This behavior is specific to the GNU `pj_getopt'.
 
    The argument `--' causes premature termination of argument
-   scanning, explicitly telling `getopt' that there are no more
+   scanning, explicitly telling `pj_getopt' that there are no more
    options.
 
    If OPTS begins with `--', then non-option arguments are treated as
    arguments to the option '\0'.  This behavior is specific to the GNU
-   `getopt'.  */
+   `pj_getopt'.  */
 
-int getopt (int argc, char *const *argv, const char *shortopts);
+int pj_getopt (int argc, char *const *argv, const char *shortopts);
 
-int getopt_long (int argc, char *const *argv, const char *options,
-		        const struct option *longopts, int *longind);
-int getopt_long_only (int argc, char *const *argv,
+int pj_getopt_long (int argc, char *const *argv, const char *options,
+		        const struct pj_getopt_option *longopts, int *longind);
+int pj_getopt_long_only (int argc, char *const *argv,
 			     const char *shortopts,
-		             const struct option *longopts, int *longind);
+		             const struct pj_getopt_option *longopts, int *longind);
 
 
 #ifdef	__cplusplus
 }
 #endif
 
-#endif /* getopt.h */
+#endif /* pj_getopt.h */
 
diff --git a/pjsip/include/pjsua-lib/pjsua.h b/pjsip/include/pjsua-lib/pjsua.h
index c3fb92a7..a2424063 100644
--- a/pjsip/include/pjsua-lib/pjsua.h
+++ b/pjsip/include/pjsua-lib/pjsua.h
@@ -465,7 +465,7 @@ pj_status_t pjsua_im_typing(int acc_index, const char *dst_uri,
  *	    Accept header.
  */
 pj_bool_t pjsua_im_accept_pager(pjsip_rx_data *rdata,
-				const pjsip_accept_hdr **p_accept_hdr);
+				pjsip_accept_hdr **p_accept_hdr);
 
 /**
  * Private: process pager message.
diff --git a/pjsip/src/pjsua-lib/getopt.c b/pjsip/src/pjsua-lib/getopt.c
index 5f39edda..acd17e53 100644
--- a/pjsip/src/pjsua-lib/getopt.c
+++ b/pjsip/src/pjsua-lib/getopt.c
@@ -18,7 +18,7 @@
  */
 
 /* 
- * getopt entry points
+ * pj_getopt entry points
  *
  * modified by Mike Borella <mike_borella@mw.3com.com>
  *
@@ -32,10 +32,10 @@
 static
 int _getopt_internal (int argc, char *const *argv,
 		      const char *shortopts,
-		      const struct option *longopts, int *longind,
+		      const struct pj_getopt_option *longopts, int *longind,
 		      int long_only);
 
-/* getopt_long and getopt_long_only entry points for GNU getopt.
+/* pj_getopt_long and pj_getopt_long_only entry points for GNU pj_getopt.
    Copyright (C) 1987,88,89,90,91,92,93,94,96,97 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -67,22 +67,22 @@ int _getopt_internal (int argc, char *const *argv,
 
 
 int
-getopt_long (int argc, char *const *argv, const char *options, 
-	     const struct option *long_options, int *opt_index)
+pj_getopt_long (int argc, char *const *argv, const char *options, 
+	     const struct pj_getopt_option *long_options, int *opt_index)
 {
   return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
 }
 
-/* Like getopt_long, but '-' as well as '--' can indicate a long option.
+/* Like pj_getopt_long, but '-' as well as '--' can indicate a long option.
    If an option that starts with '-' (not '--') doesn't match a long option,
    but does match a short option, it is parsed as a short option
    instead.  */
  
 int
-getopt (int argc, char * const * argv, const char * optstring)
+pj_getopt (int argc, char * const * argv, const char * optstring)
 {
   return _getopt_internal (argc, argv, optstring,
-			   (const struct option *) 0,
+			   (const struct pj_getopt_option *) 0,
 			   (int *) 0,
 			   0);
 }
@@ -90,11 +90,11 @@ getopt (int argc, char * const * argv, const char * optstring)
 
 #define _(msgid)	(msgid)
 
-/* This version of `getopt' appears to the caller like standard Unix `getopt'
+/* This version of `pj_getopt' appears to the caller like standard Unix `pj_getopt'
    but it behaves differently for the user, since it allows the user
    to intersperse the options with the other arguments.
 
-   As `getopt' works, it permutes the elements of ARGV so that,
+   As `pj_getopt' works, it permutes the elements of ARGV so that,
    when it is done, all the options precede everything else.  Thus
    all application programs are extended to handle flexible argument order.
 
@@ -104,31 +104,31 @@ getopt (int argc, char * const * argv, const char * optstring)
    GNU application programs can use a third alternative mode in which
    they can distinguish the relative order of options and other arguments.  */
 
-/* For communication from `getopt' to the caller.
-   When `getopt' finds an option that takes an argument,
+/* For communication from `pj_getopt' to the caller.
+   When `pj_getopt' finds an option that takes an argument,
    the argument value is returned here.
    Also, when `ordering' is RETURN_IN_ORDER,
    each non-option ARGV-element is returned here.  */
 
-char *optarg = NULL;
+char *pj_optarg = NULL;
 
 /* Index in ARGV of the next element to be scanned.
    This is used for communication to and from the caller
-   and for communication between successive calls to `getopt'.
+   and for communication between successive calls to `pj_getopt'.
 
-   On entry to `getopt', zero means this is the first call; initialize.
+   On entry to `pj_getopt', zero means this is the first call; initialize.
 
-   When `getopt' returns -1, this is the index of the first of the
+   When `pj_getopt' returns -1, this is the index of the first of the
    non-option elements that the caller should itself scan.
 
-   Otherwise, `optind' communicates from one call to the next
+   Otherwise, `pj_optind' communicates from one call to the next
    how much of ARGV has been scanned so far.  */
 
 /* 1003.2 says this must be 1 before any call.  */
-int optind = 1;
+int pj_optind = 1;
 
-/* Formerly, initialization of getopt depended on optind==0, which
-   causes problems with re-calling getopt as programs generally don't
+/* Formerly, initialization of pj_getopt depended on pj_optind==0, which
+   causes problems with re-calling pj_getopt as programs generally don't
    know that. */
 
 int __getopt_initialized = 0;
@@ -144,9 +144,9 @@ static char *nextchar;
 
 /* Set to an option character which was unrecognized.
    This must be initialized on some systems to avoid linking in the
-   system's own getopt implementation.  */
+   system's own pj_getopt implementation.  */
 
-int optopt = '?';
+int pj_optopt = '?';
 
 /* Describe how to deal with options that follow non-option ARGV-elements.
 
@@ -175,7 +175,7 @@ int optopt = '?';
 
    The special argument `--' forces an end of option-scanning regardless
    of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
-   `--' can cause `getopt' to return -1 with `optind' != ARGC.  */
+   `--' can cause `pj_getopt' to return -1 with `pj_optind' != ARGC.  */
 
 static enum
 {
@@ -212,7 +212,7 @@ static int last_nonopt;
 /* Exchange two adjacent subsequences of ARGV.
    One subsequence is elements [first_nonopt,last_nonopt)
    which contains all the non-options that have been skipped so far.
-   The other is elements [last_nonopt,optind), which contains all
+   The other is elements [last_nonopt,pj_optind), which contains all
    the options processed since those non-options were skipped.
 
    `first_nonopt' and `last_nonopt' are relocated so that they describe
@@ -223,7 +223,7 @@ exchange (char **argv)
 {
   int bottom = first_nonopt;
   int middle = last_nonopt;
-  int top = optind;
+  int top = pj_optind;
   char *tem;
 
   /* Exchange the shorter segment with the far end of the longer segment.
@@ -271,8 +271,8 @@ exchange (char **argv)
 
   /* Update records for the slots the non-options now occupy.  */
 
-  first_nonopt += (optind - last_nonopt);
-  last_nonopt = optind;
+  first_nonopt += (pj_optind - last_nonopt);
+  last_nonopt = pj_optind;
 }
 
 /* Initialize the internal data when the first call is made.  */
@@ -287,7 +287,7 @@ static const char *_getopt_initialize (int argc, char *const *argv,
      is the program name); the sequence of previously skipped
      non-option ARGV-elements is empty.  */
 
-  first_nonopt = last_nonopt = optind;
+  first_nonopt = last_nonopt = pj_optind;
 
   nextchar = NULL;
 
@@ -319,29 +319,29 @@ static const char *_getopt_initialize (int argc, char *const *argv,
 
    If an element of ARGV starts with '-', and is not exactly "-" or "--",
    then it is an option element.  The characters of this element
-   (aside from the initial '-') are option characters.  If `getopt'
+   (aside from the initial '-') are option characters.  If `pj_getopt'
    is called repeatedly, it returns successively each of the option characters
    from each of the option elements.
 
-   If `getopt' finds another option character, it returns that character,
-   updating `optind' and `nextchar' so that the next call to `getopt' can
+   If `pj_getopt' finds another option character, it returns that character,
+   updating `pj_optind' and `nextchar' so that the next call to `pj_getopt' can
    resume the scan with the following option character or ARGV-element.
 
-   If there are no more option characters, `getopt' returns -1.
-   Then `optind' is the index in ARGV of the first ARGV-element
+   If there are no more option characters, `pj_getopt' returns -1.
+   Then `pj_optind' is the index in ARGV of the first ARGV-element
    that is not an option.  (The ARGV-elements have been permuted
    so that those that are not options now come last.)
 
    OPTSTRING is a string containing the legitimate option characters.
    If an option character is seen that is not listed in OPTSTRING,
-   return '?' after printing an error message.  If you set `opterr' to
+   return '?' after printing an error message.  If you set `pj_opterr' to
    zero, the error message is suppressed but we still return '?'.
 
    If a char in OPTSTRING is followed by a colon, that means it wants an arg,
    so the following text in the same ARGV-element, or the text of the following
-   ARGV-element, is returned in `optarg'.  Two colons mean an option that
+   ARGV-element, is returned in `pj_optarg'.  Two colons mean an option that
    wants an optional arg; if there is text in the current ARGV-element,
-   it is returned in `optarg', otherwise `optarg' is set to zero.
+   it is returned in `pj_optarg', otherwise `pj_optarg' is set to zero.
 
    If OPTSTRING starts with `-' or `+', it requests different methods of
    handling the non-option ARGV-elements.
@@ -352,7 +352,7 @@ static const char *_getopt_initialize (int argc, char *const *argv,
    or is an exact match for some defined option.  If they have an
    argument, it follows the option name in the same ARGV-element, separated
    from the option name by a `=', or else the in next ARGV-element.
-   When `getopt' finds a long-named option, it returns 0 if that option's
+   When `pj_getopt' finds a long-named option, it returns 0 if that option's
    `flag' field is nonzero, the value of the option's `val' field
    if the `flag' field is zero.
 
@@ -360,7 +360,7 @@ static const char *_getopt_initialize (int argc, char *const *argv,
    But we pretend they're const in the prototype to be compatible
    with other systems.
 
-   LONGOPTS is a vector of `struct option' terminated by an
+   LONGOPTS is a vector of `struct pj_getopt_option' terminated by an
    element containing a name which is zero.
 
    LONGIND returns the index in LONGOPT of the long-named option found.
@@ -372,24 +372,24 @@ static const char *_getopt_initialize (int argc, char *const *argv,
 
 static int
 _getopt_internal (int argc, char *const *argv, const char *optstring, 
-		  const struct option *longopts, int *longind, 
+		  const struct pj_getopt_option *longopts, int *longind, 
 		  int long_only)
 {
-  optarg = NULL;
+  pj_optarg = NULL;
 
-  if (optind == 0 || !__getopt_initialized)
+  if (pj_optind == 0 || !__getopt_initialized)
     {
-      if (optind == 0)
-	optind = 1;	/* Don't scan ARGV[0], the program name.  */
+      if (pj_optind == 0)
+	pj_optind = 1;	/* Don't scan ARGV[0], the program name.  */
       optstring = _getopt_initialize (argc, argv, optstring);
       __getopt_initialized = 1;
     }
 
-  /* Test whether ARGV[optind] points to a non-option argument.
+  /* Test whether ARGV[pj_optind] points to a non-option argument.
      Either it does not have option syntax, or there is an environment flag
      from the shell indicating it is not an option.  The later information
      is only used when the used in the GNU libc.  */
-#define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0')
+#define NONOPTION_P (argv[pj_optind][0] != '-' || argv[pj_optind][1] == '\0')
 
   if (nextchar == NULL || *nextchar == '\0')
     {
@@ -397,27 +397,27 @@ _getopt_internal (int argc, char *const *argv, const char *optstring,
 
       /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been
 	 moved back by the user (who may also have changed the arguments).  */
-      if (last_nonopt > optind)
-	last_nonopt = optind;
-      if (first_nonopt > optind)
-	first_nonopt = optind;
+      if (last_nonopt > pj_optind)
+	last_nonopt = pj_optind;
+      if (first_nonopt > pj_optind)
+	first_nonopt = pj_optind;
 
       if (ordering == PERMUTE)
 	{
 	  /* If we have just processed some options following some non-options,
 	     exchange them so that the options come first.  */
 
-	  if (first_nonopt != last_nonopt && last_nonopt != optind)
+	  if (first_nonopt != last_nonopt && last_nonopt != pj_optind)
 	    exchange ((char **) argv);
-	  else if (last_nonopt != optind)
-	    first_nonopt = optind;
+	  else if (last_nonopt != pj_optind)
+	    first_nonopt = pj_optind;
 
 	  /* Skip any additional non-options
 	     and extend the range of non-options previously skipped.  */
 
-	  while (optind < argc && NONOPTION_P)
-	    optind++;
-	  last_nonopt = optind;
+	  while (pj_optind < argc && NONOPTION_P)
+	    pj_optind++;
+	  last_nonopt = pj_optind;
 	}
 
       /* The special ARGV-element `--' means premature end of options.
@@ -425,28 +425,28 @@ _getopt_internal (int argc, char *const *argv, const char *optstring,
 	 then exchange with previous non-options as if it were an option,
 	 then skip everything else like a non-option.  */
 
-      if (optind != argc && !pj_ansi_strcmp(argv[optind], "--"))
+      if (pj_optind != argc && !pj_ansi_strcmp(argv[pj_optind], "--"))
 	{
-	  optind++;
+	  pj_optind++;
 
-	  if (first_nonopt != last_nonopt && last_nonopt != optind)
+	  if (first_nonopt != last_nonopt && last_nonopt != pj_optind)
 	    exchange ((char **) argv);
 	  else if (first_nonopt == last_nonopt)
-	    first_nonopt = optind;
+	    first_nonopt = pj_optind;
 	  last_nonopt = argc;
 
-	  optind = argc;
+	  pj_optind = argc;
 	}
 
       /* If we have done all the ARGV-elements, stop the scan
 	 and back over any non-options that we skipped and permuted.  */
 
-      if (optind == argc)
+      if (pj_optind == argc)
 	{
 	  /* Set the next-arg-index to point at the non-options
 	     that we previously skipped, so the caller will digest them.  */
 	  if (first_nonopt != last_nonopt)
-	    optind = first_nonopt;
+	    pj_optind = first_nonopt;
 	  return -1;
 	}
 
@@ -457,15 +457,15 @@ _getopt_internal (int argc, char *const *argv, const char *optstring,
 	{
 	  if (ordering == REQUIRE_ORDER)
 	    return -1;
-	  optarg = argv[optind++];
+	  pj_optarg = argv[pj_optind++];
 	  return 1;
 	}
 
       /* We have found another option-ARGV-element.
 	 Skip the initial punctuation.  */
 
-      nextchar = (argv[optind] + 1
-		  + (longopts != NULL && argv[optind][1] == '-'));
+      nextchar = (argv[pj_optind] + 1
+		  + (longopts != NULL && argv[pj_optind][1] == '-'));
     }
 
   /* Decode the current option-ARGV-element.  */
@@ -484,12 +484,12 @@ _getopt_internal (int argc, char *const *argv, const char *optstring,
      This distinction seems to be the most useful approach.  */
 
   if (longopts != NULL
-      && (argv[optind][1] == '-'
-	  || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1])))))
+      && (argv[pj_optind][1] == '-'
+	  || (long_only && (argv[pj_optind][2] || !my_index (optstring, argv[pj_optind][1])))))
     {
       char *nameend;
-      const struct option *p;
-      const struct option *pfound = NULL;
+      const struct pj_getopt_option *p;
+      const struct pj_getopt_option *pfound = NULL;
       int exact = 0;
       int ambig = 0;
       int indfound = -1;
@@ -526,37 +526,37 @@ _getopt_internal (int argc, char *const *argv, const char *optstring,
       if (ambig && !exact)
 	{
 	  nextchar += strlen (nextchar);
-	  optind++;
-	  optopt = 0;
+	  pj_optind++;
+	  pj_optopt = 0;
 	  return '?';
 	}
 
       if (pfound != NULL)
 	{
 	  option_index = indfound;
-	  optind++;
+	  pj_optind++;
 	  if (*nameend)
 	    {
 	      /* Don't test has_arg with >, because some C compilers don't
 		 allow it to be used on enums.  */
 	      if (pfound->has_arg)
-		optarg = nameend + 1;
+		pj_optarg = nameend + 1;
 	      else
 		{
 		  nextchar += strlen (nextchar);
 
-		  optopt = pfound->val;
+		  pj_optopt = pfound->val;
 		  return '?';
 		}
 	    }
 	  else if (pfound->has_arg == 1)
 	    {
-	      if (optind < argc)
-		optarg = argv[optind++];
+	      if (pj_optind < argc)
+		pj_optarg = argv[pj_optind++];
 	      else
 		{
 		  nextchar += strlen (nextchar);
-		  optopt = pfound->val;
+		  pj_optopt = pfound->val;
 		  return optstring[0] == ':' ? ':' : '?';
 		}
 	    }
@@ -571,16 +571,16 @@ _getopt_internal (int argc, char *const *argv, const char *optstring,
 	  return pfound->val;
 	}
 
-      /* Can't find it as a long option.  If this is not getopt_long_only,
+      /* Can't find it as a long option.  If this is not pj_getopt_long_only,
 	 or the option starts with '--' or is not a valid short
 	 option, then it's an error.
 	 Otherwise interpret it as a short option.  */
-      if (!long_only || argv[optind][1] == '-'
+      if (!long_only || argv[pj_optind][1] == '-'
 	  || my_index (optstring, *nextchar) == NULL)
 	{
 	  nextchar = (char *) "";
-	  optind++;
-	  optopt = 0;
+	  pj_optind++;
+	  pj_optopt = 0;
 	  return '?';
 	}
     }
@@ -591,21 +591,21 @@ _getopt_internal (int argc, char *const *argv, const char *optstring,
     char c = *nextchar++;
     char *temp = my_index (optstring, c);
 
-    /* Increment `optind' when we start to process its last character.  */
+    /* Increment `pj_optind' when we start to process its last character.  */
     if (*nextchar == '\0')
-      ++optind;
+      ++pj_optind;
 
     if (temp == NULL || c == ':')
       {
-	optopt = c;
+	pj_optopt = c;
 	return '?';
       }
     /* Convenience. Treat POSIX -W foo same as long option --foo */
     if (temp[0] == 'W' && temp[1] == ';')
       {
 	char *nameend;
-	const struct option *p;
-	const struct option *pfound = NULL;
+	const struct pj_getopt_option *p;
+	const struct pj_getopt_option *pfound = NULL;
 	int exact = 0;
 	int ambig = 0;
 	int indfound = 0;
@@ -614,14 +614,14 @@ _getopt_internal (int argc, char *const *argv, const char *optstring,
 	/* This is an option that requires an argument.  */
 	if (*nextchar != '\0')
 	  {
-	    optarg = nextchar;
+	    pj_optarg = nextchar;
 	    /* If we end this ARGV-element by taking the rest as an arg,
 	       we must advance to the next element now.  */
-	    optind++;
+	    pj_optind++;
 	  }
-	else if (optind == argc)
+	else if (pj_optind == argc)
 	  {
-	    optopt = c;
+	    pj_optopt = c;
 	    if (optstring[0] == ':')
 	      c = ':';
 	    else
@@ -629,14 +629,14 @@ _getopt_internal (int argc, char *const *argv, const char *optstring,
 	    return c;
 	  }
 	else
-	  /* We already incremented `optind' once;
+	  /* We already incremented `pj_optind' once;
 	     increment it again when taking next ARGV-elt as argument.  */
-	  optarg = argv[optind++];
+	  pj_optarg = argv[pj_optind++];
 
-	/* optarg is now the argument, see if it's in the
+	/* pj_optarg is now the argument, see if it's in the
 	   table of longopts.  */
 
-	for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++)
+	for (nextchar = nameend = pj_optarg; *nameend && *nameend != '='; nameend++)
 	  /* Do nothing.  */ ;
 
 	/* Test all long options for either exact match
@@ -665,7 +665,7 @@ _getopt_internal (int argc, char *const *argv, const char *optstring,
 	if (ambig && !exact)
 	  {
 	    nextchar += strlen (nextchar);
-	    optind++;
+	    pj_optind++;
 	    return '?';
 	  }
 	if (pfound != NULL)
@@ -676,7 +676,7 @@ _getopt_internal (int argc, char *const *argv, const char *optstring,
 		/* Don't test has_arg with >, because some C compilers don't
 		   allow it to be used on enums.  */
 		if (pfound->has_arg)
-		  optarg = nameend + 1;
+		  pj_optarg = nameend + 1;
 		else
 		  {
 		    nextchar += strlen (nextchar);
@@ -685,8 +685,8 @@ _getopt_internal (int argc, char *const *argv, const char *optstring,
 	      }
 	    else if (pfound->has_arg == 1)
 	      {
-		if (optind < argc)
-		  optarg = argv[optind++];
+		if (pj_optind < argc)
+		  pj_optarg = argv[pj_optind++];
 		else
 		  {
 		    nextchar += strlen (nextchar);
@@ -713,11 +713,11 @@ _getopt_internal (int argc, char *const *argv, const char *optstring,
 	    /* This is an option that accepts an argument optionally.  */
 	    if (*nextchar != '\0')
 	      {
-		optarg = nextchar;
-		optind++;
+		pj_optarg = nextchar;
+		pj_optind++;
 	      }
 	    else
-	      optarg = NULL;
+	      pj_optarg = NULL;
 	    nextchar = NULL;
 	  }
 	else
@@ -725,23 +725,23 @@ _getopt_internal (int argc, char *const *argv, const char *optstring,
 	    /* This is an option that requires an argument.  */
 	    if (*nextchar != '\0')
 	      {
-		optarg = nextchar;
+		pj_optarg = nextchar;
 		/* If we end this ARGV-element by taking the rest as an arg,
 		   we must advance to the next element now.  */
-		optind++;
+		pj_optind++;
 	      }
-	    else if (optind == argc)
+	    else if (pj_optind == argc)
 	      {
-		optopt = c;
+		pj_optopt = c;
 		if (optstring[0] == ':')
 		  c = ':';
 		else
 		  c = '?';
 	      }
 	    else
-	      /* We already incremented `optind' once;
+	      /* We already incremented `pj_optind' once;
 		 increment it again when taking next ARGV-elt as argument.  */
-	      optarg = argv[optind++];
+	      pj_optarg = argv[pj_optind++];
 	    nextchar = NULL;
 	  }
       }
diff --git a/pjsip/src/pjsua-lib/pjsua_im.c b/pjsip/src/pjsua-lib/pjsua_im.c
index 4778d8fa..cd0bd898 100644
--- a/pjsip/src/pjsua-lib/pjsua_im.c
+++ b/pjsip/src/pjsua-lib/pjsua_im.c
@@ -107,7 +107,7 @@ pjsip_accept_hdr* pjsua_im_create_accept(pj_pool_t *pool)
  * Private: check if we can accept the message.
  */
 pj_bool_t pjsua_im_accept_pager(pjsip_rx_data *rdata,
-				const pjsip_accept_hdr **p_accept_hdr)
+				pjsip_accept_hdr **p_accept_hdr)
 {
     pjsip_ctype_hdr *ctype;
     pjsip_msg *msg;
diff --git a/pjsip/src/pjsua-lib/pjsua_settings.c b/pjsip/src/pjsua-lib/pjsua_settings.c
index 4f02c23b..234a5943 100644
--- a/pjsip/src/pjsua-lib/pjsua_settings.c
+++ b/pjsip/src/pjsua-lib/pjsua_settings.c
@@ -227,7 +227,7 @@ pj_status_t pjsua_parse_args(int argc, char *argv[])
 	   OPT_COMPLEXITY, OPT_QUALITY,
 	   OPT_NEXT_ACCOUNT, OPT_NEXT_CRED, OPT_MAX_CALLS,
     };
-    struct option long_options[] = {
+    struct pj_getopt_option long_options[] = {
 	{ "config-file",1, 0, OPT_CONFIG_FILE},
 	{ "log-file",	1, 0, OPT_LOG_FILE},
 	{ "log-level",	1, 0, OPT_LOG_LEVEL},
@@ -272,11 +272,11 @@ pj_status_t pjsua_parse_args(int argc, char *argv[])
     pjsip_cred_info *cur_cred;
     char *config_file = NULL;
 
-    /* Run getopt once to see if user specifies config file to read. */
-    while ((c=getopt_long(argc, argv, "", long_options, &option_index)) != -1) {
+    /* Run pj_getopt once to see if user specifies config file to read. */ 
+    while ((c=pj_getopt_long(argc, argv, "", long_options, &option_index)) != -1) {
 	switch (c) {
 	case OPT_CONFIG_FILE:
-	    config_file = optarg;
+	    config_file = pj_optarg;
 	    break;
 	}
 	if (config_file)
@@ -294,11 +294,11 @@ pj_status_t pjsua_parse_args(int argc, char *argv[])
     cur_cred = &pjsua.cred_info[0];
 
 
-    /* Reinitialize and re-run getopt again, possibly with new arguments
+    /* Reinitialize and re-run pj_getopt again, possibly with new arguments
      * read from config file.
      */
-    optind = 0;
-    while ((c=getopt_long(argc, argv, "", long_options, &option_index)) != -1) {
+    pj_optind = 0;
+    while((c=pj_getopt_long(argc, argv, "", long_options, &option_index))!=-1) {
 	char *p;
 	pj_str_t tmp;
 	long lval;
@@ -306,11 +306,11 @@ pj_status_t pjsua_parse_args(int argc, char *argv[])
 	switch (c) {
 
 	case OPT_LOG_FILE:
-	    pjsua.log_filename = optarg;
+	    pjsua.log_filename = pj_optarg;
 	    break;
 
 	case OPT_LOG_LEVEL:
-	    c = pj_strtoul(pj_cstr(&tmp, optarg));
+	    c = pj_strtoul(pj_cstr(&tmp, pj_optarg));
 	    if (c < 0 || c > 6) {
 		printf("Error: expecting integer value 0-6 for --log-level\n");
 		return PJ_EINVAL;
@@ -319,7 +319,7 @@ pj_status_t pjsua_parse_args(int argc, char *argv[])
 	    break;
 
 	case OPT_APP_LOG_LEVEL:
-	    pjsua.app_log_level = pj_strtoul(pj_cstr(&tmp, optarg));
+	    pjsua.app_log_level = pj_strtoul(pj_cstr(&tmp, pj_optarg));
 	    if (pjsua.app_log_level < 0 || pjsua.app_log_level > 6) {
 		printf("Error: expecting integer value 0-6 for --app-log-level\n");
 		return PJ_EINVAL;
@@ -347,7 +347,7 @@ pj_status_t pjsua_parse_args(int argc, char *argv[])
 	    break;
 
 	case OPT_LOCAL_PORT:   /* local-port */
-	    lval = pj_strtoul(pj_cstr(&tmp, optarg));
+	    lval = pj_strtoul(pj_cstr(&tmp, pj_optarg));
 	    if (lval < 1 || lval > 65535) {
 		printf("Error: expecting integer value for --local-port\n");
 		return PJ_EINVAL;
@@ -356,31 +356,31 @@ pj_status_t pjsua_parse_args(int argc, char *argv[])
 	    break;
 
 	case OPT_PROXY:   /* proxy */
-	    if (pjsua_verify_sip_url(optarg) != 0) {
-		printf("Error: invalid SIP URL '%s' in proxy argument\n", optarg);
+	    if (pjsua_verify_sip_url(pj_optarg) != 0) {
+		printf("Error: invalid SIP URL '%s' in proxy argument\n", pj_optarg);
 		return PJ_EINVAL;
 	    }
-	    cur_acc->proxy = pj_str(optarg);
+	    cur_acc->proxy = pj_str(pj_optarg);
 	    break;
 
 	case OPT_OUTBOUND_PROXY:   /* outbound proxy */
-	    if (pjsua_verify_sip_url(optarg) != 0) {
-		printf("Error: invalid SIP URL '%s' in outbound proxy argument\n", optarg);
+	    if (pjsua_verify_sip_url(pj_optarg) != 0) {
+		printf("Error: invalid SIP URL '%s' in outbound proxy argument\n", pj_optarg);
 		return PJ_EINVAL;
 	    }
-	    pjsua.outbound_proxy = pj_str(optarg);
+	    pjsua.outbound_proxy = pj_str(pj_optarg);
 	    break;
 
 	case OPT_REGISTRAR:   /* registrar */
-	    if (pjsua_verify_sip_url(optarg) != 0) {
-		printf("Error: invalid SIP URL '%s' in registrar argument\n", optarg);
+	    if (pjsua_verify_sip_url(pj_optarg) != 0) {
+		printf("Error: invalid SIP URL '%s' in registrar argument\n", pj_optarg);
 		return PJ_EINVAL;
 	    }
-	    cur_acc->reg_uri = pj_str(optarg);
+	    cur_acc->reg_uri = pj_str(pj_optarg);
 	    break;
 
 	case OPT_REG_TIMEOUT:   /* reg-timeout */
-	    cur_acc->reg_timeout = pj_strtoul(pj_cstr(&tmp,optarg));
+	    cur_acc->reg_timeout = pj_strtoul(pj_cstr(&tmp,pj_optarg));
 	    if (cur_acc->reg_timeout < 1 || cur_acc->reg_timeout > 3600) {
 		printf("Error: invalid value for --reg-timeout (expecting 1-3600)\n");
 		return PJ_EINVAL;
@@ -388,20 +388,20 @@ pj_status_t pjsua_parse_args(int argc, char *argv[])
 	    break;
 
 	case OPT_ID:   /* id */
-	    if (pjsua_verify_sip_url(optarg) != 0) {
-		printf("Error: invalid SIP URL '%s' in local id argument\n", optarg);
+	    if (pjsua_verify_sip_url(pj_optarg) != 0) {
+		printf("Error: invalid SIP URL '%s' in local id argument\n", pj_optarg);
 		return PJ_EINVAL;
 	    }
-	    cur_acc->local_uri = pj_str(optarg);
+	    cur_acc->local_uri = pj_str(pj_optarg);
 	    pjsua.has_acc = 1;
 	    break;
 
 	case OPT_CONTACT:   /* contact */
-	    if (pjsua_verify_sip_url(optarg) != 0) {
-		printf("Error: invalid SIP URL '%s' in contact argument\n", optarg);
+	    if (pjsua_verify_sip_url(pj_optarg) != 0) {
+		printf("Error: invalid SIP URL '%s' in contact argument\n", pj_optarg);
 		return PJ_EINVAL;
 	    }
-	    cur_acc->contact_uri = pj_str(optarg);
+	    cur_acc->contact_uri = pj_str(pj_optarg);
 	    break;
 
 	case OPT_NEXT_ACCOUNT: /* Add more account. */
@@ -411,18 +411,18 @@ pj_status_t pjsua_parse_args(int argc, char *argv[])
 
 	case OPT_USERNAME:   /* Default authentication user */
 	    if (pjsua.cred_count==0) pjsua.cred_count=1;
-	    cur_cred->username = pj_str(optarg);
+	    cur_cred->username = pj_str(pj_optarg);
 	    break;
 
 	case OPT_REALM:	    /* Default authentication realm. */
 	    if (pjsua.cred_count==0) pjsua.cred_count=1;
-	    cur_cred->realm = pj_str(optarg);
+	    cur_cred->realm = pj_str(pj_optarg);
 	    break;
 
 	case OPT_PASSWORD:   /* authentication password */
 	    if (pjsua.cred_count==0) pjsua.cred_count=1;
 	    cur_cred->data_type = 0;
-	    cur_cred->data = pj_str(optarg);
+	    cur_cred->data = pj_str(pj_optarg);
 	    break;
 
 	case OPT_NEXT_CRED: /* Next credential */
@@ -431,10 +431,10 @@ pj_status_t pjsua_parse_args(int argc, char *argv[])
 	    break;
 
 	case OPT_USE_STUN1:   /* STUN server 1 */
-	    p = pj_ansi_strchr(optarg, ':');
+	    p = pj_ansi_strchr(pj_optarg, ':');
 	    if (p) {
 		*p = '\0';
-		pjsua.stun_srv1 = pj_str(optarg);
+		pjsua.stun_srv1 = pj_str(pj_optarg);
 		pjsua.stun_port1 = pj_strtoul(pj_cstr(&tmp, p+1));
 		if (pjsua.stun_port1 < 1 || pjsua.stun_port1 > 65535) {
 		    printf("Error: expecting port number with option --use-stun1\n");
@@ -442,15 +442,15 @@ pj_status_t pjsua_parse_args(int argc, char *argv[])
 		}
 	    } else {
 		pjsua.stun_port1 = 3478;
-		pjsua.stun_srv1 = pj_str(optarg);
+		pjsua.stun_srv1 = pj_str(pj_optarg);
 	    }
 	    break;
 
 	case OPT_USE_STUN2:   /* STUN server 2 */
-	    p = pj_ansi_strchr(optarg, ':');
+	    p = pj_ansi_strchr(pj_optarg, ':');
 	    if (p) {
 		*p = '\0';
-		pjsua.stun_srv2 = pj_str(optarg);
+		pjsua.stun_srv2 = pj_str(pj_optarg);
 		pjsua.stun_port2 = pj_strtoul(pj_cstr(&tmp,p+1));
 		if (pjsua.stun_port2 < 1 || pjsua.stun_port2 > 65535) {
 		    printf("Error: expecting port number with option --use-stun2\n");
@@ -458,20 +458,20 @@ pj_status_t pjsua_parse_args(int argc, char *argv[])
 		}
 	    } else {
 		pjsua.stun_port2 = 3478;
-		pjsua.stun_srv2 = pj_str(optarg);
+		pjsua.stun_srv2 = pj_str(pj_optarg);
 	    }
 	    break;
 
 	case OPT_ADD_BUDDY: /* Add to buddy list. */
-	    if (pjsua_verify_sip_url(optarg) != 0) {
-		printf("Error: invalid URL '%s' in --add-buddy option\n", optarg);
+	    if (pjsua_verify_sip_url(pj_optarg) != 0) {
+		printf("Error: invalid URL '%s' in --add-buddy option\n", pj_optarg);
 		return -1;
 	    }
 	    if (pjsua.buddy_cnt == PJSUA_MAX_BUDDIES) {
 		printf("Error: too many buddies in buddy list.\n");
 		return -1;
 	    }
-	    pjsua.buddies[pjsua.buddy_cnt++].uri = pj_str(optarg);
+	    pjsua.buddies[pjsua.buddy_cnt++].uri = pj_str(pj_optarg);
 	    break;
 
 	case OPT_AUTO_PLAY:
@@ -487,11 +487,11 @@ pj_status_t pjsua_parse_args(int argc, char *argv[])
 	    break;
 
 	case OPT_PLAY_FILE:
-	    pjsua.wav_file = optarg;
+	    pjsua.wav_file = pj_optarg;
 	    break;
 
 	case OPT_RTP_PORT:
-	    pjsua.start_rtp_port = my_atoi(optarg);
+	    pjsua.start_rtp_port = my_atoi(pj_optarg);
 	    if (pjsua.start_rtp_port < 1 || pjsua.start_rtp_port > 65535) {
 		PJ_LOG(1,(THIS_FILE,
 			  "Error: rtp-port argument value (expecting 1-65535"));
@@ -499,11 +499,11 @@ pj_status_t pjsua_parse_args(int argc, char *argv[])
 	    }
 
 	case OPT_ADD_CODEC:
-	    pjsua.codec_arg[pjsua.codec_cnt++] = pj_str(optarg);
+	    pjsua.codec_arg[pjsua.codec_cnt++] = pj_str(pj_optarg);
 	    break;
 
 	case OPT_COMPLEXITY:
-	    pjsua.complexity = my_atoi(optarg);
+	    pjsua.complexity = my_atoi(pj_optarg);
 	    if (pjsua.complexity < 0 || pjsua.complexity > 10) {
 		PJ_LOG(1,(THIS_FILE,
 			  "Error: invalid --complexity (expecting 0-10"));
@@ -512,7 +512,7 @@ pj_status_t pjsua_parse_args(int argc, char *argv[])
 	    break;
 
 	case OPT_QUALITY:
-	    pjsua.quality = my_atoi(optarg);
+	    pjsua.quality = my_atoi(pj_optarg);
 	    if (pjsua.quality < 0 || pjsua.quality > 10) {
 		PJ_LOG(1,(THIS_FILE,
 			  "Error: invalid --quality (expecting 0-10"));
@@ -521,7 +521,7 @@ pj_status_t pjsua_parse_args(int argc, char *argv[])
 	    break;
 
 	case OPT_AUTO_ANSWER:
-	    pjsua.auto_answer = my_atoi(optarg);
+	    pjsua.auto_answer = my_atoi(pj_optarg);
 	    if (pjsua.auto_answer < 100 || pjsua.auto_answer > 699) {
 		PJ_LOG(1,(THIS_FILE,
 			  "Error: invalid code in --auto-answer (expecting 100-699"));
@@ -530,7 +530,7 @@ pj_status_t pjsua_parse_args(int argc, char *argv[])
 	    break;
 
 	case OPT_MAX_CALLS:
-	    pjsua.max_calls = my_atoi(optarg);
+	    pjsua.max_calls = my_atoi(pj_optarg);
 	    if (pjsua.max_calls < 1 || pjsua.max_calls > 255) {
 		PJ_LOG(1,(THIS_FILE,"Too many calls for max-calls (1-255)"));
 		return -1;
@@ -539,8 +539,8 @@ pj_status_t pjsua_parse_args(int argc, char *argv[])
 	}
     }
 
-    if (optind != argc) {
-	printf("Error: unknown options %s\n", argv[optind]);
+    if (pj_optind != argc) {
+	printf("Error: unknown options %s\n", argv[pj_optind]);
 	return PJ_EINVAL;
     }