[Asterisk-code-review] asterisk.h: Add ASTERISK REGISTER FILE macro (asterisk[13])

George Joseph asteriskteam at digium.com
Tue Jan 5 15:09:33 CST 2016


George Joseph has uploaded a new patch set (#2).

Change subject: asterisk.h: Add ASTERISK_REGISTER_FILE macro
......................................................................

asterisk.h: Add ASTERISK_REGISTER_FILE macro

The 13 branch and master use 2 different file version macros. 13 uses
ASTERISK_FILE_VERSION but master uses ASTERISK_REGISTER_FILE. This
means a new file added to 13 can't just be cherry-picked to master
because the macro has to be changed.

To make cherry-picking possible, ASTERISK_REGISTER_FILE was added
to asterisk.h as a simple alias for ASTERISK_FILE_VERSION(__FILE__, NULL)
The "$Revision$" tag doesn't do anything in 13 so just passing NULL as
the verison works fine.  asterisk.h was also annotated to deprecate
ASTERISK_FILE_VERSION and suggest using ASTERISK_REGISTER_FILE for
all new files.

Finally, 2 recent file additions, pbx_builtins.c and pbx_functions.c,
were modified to use the new macro to make sure it actually worked.
'core show file version' showed the correct output.

Change-Id: I5867ed898818d26ee49bb6e5c7d4c1a45d4789a5
---
M include/asterisk.h
M main/pbx_builtins.c
M main/pbx_functions.c
3 files changed, 22 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/18/1918/2
-- 
To view, visit https://gerrit.asterisk.org/1918
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I5867ed898818d26ee49bb6e5c7d4c1a45d4789a5
Gerrit-PatchSet: 2
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: George Joseph <george.joseph at fairview5.com>



More information about the asterisk-code-review mailing list