am 60915b63: Merge commit \'4b076f42bdd1408937328c626f01c7c54301fa67\' into HEAD

* commit '60915b634faf786c82bd98773e1321ceb4254112':
am 804fcc53: Merge commit \'422a8f60f259b41f3909d1dfec9e0807454c9683\' into HEAD

* commit '804fcc53ee88e72c3bd079c81797ec624c839a6c':
am 2f60ea80: Merge "Make sure std::size_t is available before it is used"

* commit '2f60ea803f7214dc477392482d5726a5bf41583a':
  Make sure std::size_t is available before it is used
Fix 64 bit builds.

stlport doesn't expose localeconv and setlocale
anyway, so there really isn't much point in exporting
lconv either.

This is not a source compatible change, but it certainly
isn't the first such change we've made. Besides, lconv is
a dummy structure anyway and there's nothing useful to be
gained from it.

Change-Id: Ifeeb929fc43bfc7a7c522cae18b9916027f04b82
Merge "Fix 64 bit builds."
am 6f6b22e9: Merge "Fix 64 bit builds."

* commit '6f6b22e921d47ab5a6625199f609d2bbfb409061':
  Fix 64 bit builds.
stlport: Fix boundary condition in stlport for __get_integer.

The __get_integer doesn't trigger -min for signed (int, long, long long)
as overflow.

Change-Id: Iba8f594fd7c2f404aa14367c9201b8b116cd36fc
Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
Merge "stlport: Fix boundary condition in stlport for __get_integer."
Fix __get_number for short.

Change-Id: I31d62728218937c669c464e0c1395369afb11518
Merge "Fix __get_number for short."
Merge commit '05fa6fe6de8d3a3b9f2d0d70533bd911ec9094be' into HEAD
stlport: deal with compile warnings

- In preparation for dependent projects to turn on
  -Werror and -Wunused

Change-Id: Ibf1b146d8d389e8747ba1ea1735cb55722b85971
stlport: c_locale_dummy unused argument warnings

Change-Id: Ib5e6736f83791c9795f9d4a5b5b8b201ed6327f6
stlport: if we can not throw, let us abort

Change-Id: I8b9ea8d48548bd879d03e605e200c0e7e7c73948
Merge changes Ib5e6736f,Ibf1b146d

* changes:
  stlport: c_locale_dummy unused argument warnings
  stlport: deal with compile warnings
Merge "stlport: if we can not throw, let us abort"
am 01d98425: Merge changes Ib5e6736f,Ibf1b146d

* commit '01d98425a4d9b02e306a14a746541990df3d5743':
  stlport: c_locale_dummy unused argument warnings
  stlport: deal with compile warnings
am 474dac4d: Merge "stlport: if we can not throw, let us abort"

* commit '474dac4d0c5760d47dfb6ac52f6d9fc733fd2208':
  stlport: if we can not throw, let us abort
Fix sincosf -> sincosf recursion

(cherry picked from commit ff4a56e1f49d950e522066e67c64951748a01cb5)

Change-Id: Idbe25881ed66e26395126a80b55c6f4dbc1f0e29
Remove obsolete sincos from stlport

Change-Id: I12644a0e81d6dcf11d12530234678d178dbc4caf