Bug 672843 part D - make NS_ERROR_INVALID_POINTER an alias of NS_ERROR_INVALID_ARG, r=froydnj

This commit is contained in:
Benjamin Smedberg 2013-11-19 16:27:37 -05:00
Родитель 8fd1bc7f20
Коммит 6a4ff78542
2 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -23,7 +23,7 @@ GetHRESULT(nsresult aResult)
case NS_OK:
return S_OK;
case NS_ERROR_INVALID_ARG: case NS_ERROR_INVALID_POINTER:
case NS_ERROR_INVALID_ARG:
return E_INVALIDARG;
case NS_ERROR_OUT_OF_MEMORY:

Просмотреть файл

@ -16,8 +16,6 @@
/* Returned when a given interface is not supported. */
ERROR(NS_NOINTERFACE, 0x80004002),
ERROR(NS_ERROR_NO_INTERFACE, NS_NOINTERFACE),
ERROR(NS_ERROR_INVALID_POINTER, 0x80004003),
ERROR(NS_ERROR_NULL_POINTER, NS_ERROR_INVALID_POINTER),
/* Returned when a function aborts */
ERROR(NS_ERROR_ABORT, 0x80004004),
/* Returned when a function fails */
@ -29,6 +27,8 @@
/* Returned when an illegal value is passed */
ERROR(NS_ERROR_ILLEGAL_VALUE, 0x80070057),
ERROR(NS_ERROR_INVALID_ARG, NS_ERROR_ILLEGAL_VALUE),
ERROR(NS_ERROR_INVALID_POINTER, NS_ERROR_INVALID_ARG),
ERROR(NS_ERROR_NULL_POINTER, NS_ERROR_INVALID_ARG),
/* Returned when a class doesn't allow aggregation */
ERROR(NS_ERROR_NO_AGGREGATION, 0x80040110),
/* Returned when an operation can't complete due to an unavailable resource */