[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=4936ea2a8e352e74b2e667d177445f3c59166c45
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

4936ea2 by Guy Harris (guy@xxxxxxxxxxxx):

    Rename buffer_ routines to tagbuffer_ to avoid name collisions.
    
    In particular, collisions with the buffer_ routines in libwsutil; in the
    trunk, we renamed *those* routines, but that breaks API/ABI
    compatibility, so, in the 1.12 branch, we rename these routines, which
    adds a difference between this code and the Lrexlib release that we'd
    rather not have if we can avoid it.
    
    This should fix bug 10332.
    
    Change-Id: Ib37a50713acb880fb79adacc91f7bb49959be97e
    Reviewed-on: https://code.wireshark.org/review/3352
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  e2f1fa6   Fix a couple debian dist files which are different for master-1.12.
    adds  4936ea2   Rename buffer_ routines to tagbuffer_ to avoid name collisions.


Summary of changes:
 epan/wslua/lrexlib.c |   34 +++++++++++++++++-----------------
 epan/wslua/lrexlib.h |   14 +++++++-------
 2 files changed, 24 insertions(+), 24 deletions(-)