kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-22 13:25:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'ASTERISK-25027'

Browse Source 
* 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
parent f6202f5cf0 881844297a
commit d6ecbbac0a
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

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

1
doc/.gitignore vendored
View File

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

12
res/res_pjsip/presence_xml.c
View File

@@ -16,14 +16,6 @@
* at the top of the source tree. * 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 "asterisk.h"
#include <pjsip.h> #include <pjsip.h>
@@ -31,10 +23,8 @@
#include <pjlib.h> #include <pjlib.h>
#include "asterisk/module.h" #include "asterisk/module.h"
#include "asterisk/res_pjsip.h" #include "asterisk/pbx.h"
#include "asterisk/res_pjsip_pubsub.h"
#include "asterisk/res_pjsip_presence_xml.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) void ast_sip_sanitize_xml(const char *input, char *output, size_t len)
{ {