Merge topic 'ASTERISK-25027'

* changes:
  res_pjsip: Remove incorrect MODULEINFO from presence_xml.c.
  Git Migration: Create doc/rest-api when needed.
This commit is contained in:
Matt Jordan
2015-04-29 09:49:43 -05:00
committed by Gerrit Code Review
3 changed files with 3 additions and 11 deletions

View File

@@ -982,6 +982,7 @@ ifeq ($(PYTHON),:)
@echo "--------------------------------------------------------------------------"
@false
else
@$(INSTALL) -d doc/rest-api
$(PYTHON) rest-api-templates/make_ari_stubs.py \
rest-api/resources.json .
endif

1
doc/.gitignore vendored
View File

@@ -1 +1,2 @@
core-en_US.xml
rest-api

View File

@@ -16,14 +16,6 @@
* at the top of the source tree.
*/
/*** MODULEINFO
<depend>pjproject</depend>
<depend>res_pjsip</depend>
<depend>res_pjsip_pubsub</depend>
<depend>res_pjsip_exten_state</depend>
<support_level>core</support_level>
***/
#include "asterisk.h"
#include <pjsip.h>
@@ -31,10 +23,8 @@
#include <pjlib.h>
#include "asterisk/module.h"
#include "asterisk/res_pjsip.h"
#include "asterisk/res_pjsip_pubsub.h"
#include "asterisk/pbx.h"
#include "asterisk/res_pjsip_presence_xml.h"
#include "asterisk/res_pjsip_body_generator_types.h"
void ast_sip_sanitize_xml(const char *input, char *output, size_t len)
{