← Back to branch summary

~damg/ubuntu/quantal/asterisk/LP1097687

« back to all changes in this revision

Viewing changes to pbx/pbx_lua.c

  • Committer: Bazaar Package Importer
  • Author(s): Lorenzo De Liso
  • Date: 2010-10-15 22:24:34 UTC
  • mfrom: (1.2.8 upstream) (8.3.8 sid)
  • Revision ID: james.westby@ubuntu.com-20101015222434-iy328q8in3lajzlv
Tags: 1:1.6.2.9-2ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/control:
    + Build-depend on hardening-wrapper
    + Change Maintainer
    + Removed Uploaders field.
    + Removed Debian Vcs-Svn entry and replaced with ubuntu-voip Vcs-Bzr,
      to reflect divergence in packages.
  - debian/rules: Make use of hardening-wrapper
  - debian/asterisk.init: chown /dev/dahdi
  - debian/backports/hardy: add file
  - debian/backports/asterisk.init.hardy: add file
 

Show diffs side-by-side

added added

removed removed

Lines of Context:
pbx/pbx_lua.c
30
30
 
31
31
#include "asterisk.h"
32
32
 
33
 
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 231191 $")
 
33
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 265748 $")
34
34
 
35
35
#include "asterisk/logger.h"
36
36
#include "asterisk/channel.h"
42
42
#include "asterisk/paths.h"
43
43
#include "asterisk/hashtab.h"
44
44
 
45
 
#ifdef LUA51_PREFIX
46
 
#include <lua5.1/lua.h>
47
 
#include <lua5.1/lauxlib.h>
48
 
#include <lua5.1/lualib.h>
49
 
#else
50
45
#include <lua.h>
51
46
#include <lauxlib.h>
52
47
#include <lualib.h>
53
 
#endif
54
48
 
55
49
static char *config = "extensions.lua";
56
50
static char *registrar = "pbx_lua";