DELTA 25888 304080 1210
SVN  ‰,‰
, ‡! ¬ L‡` defined(HAVE_POPEN) && defined(HAVE_PCLOSE)ENDREP
DELTA 28150 56 659
SVN  ˆˆ€†y W €Q n(€R „3ƒhdiff -Nurd lua-5.3/src/ldo.c lua-5.3/src/ldo.c
--- lua-5.3/src/ldo.c	2015-01-30 22:34:26.329033992 +0200
+++ lua-5.3/src/ldo.c	2015-02-14 22:51:25.740710930 +0200
@@ -60,7 +60,7 @@
 	try { a } catch(...) { if ((c)->status == 0) (c)->status = -1; }
 #define luai_jmpbuf		int  /* dummy variable */
 
-#elif defined(LUA_USE_POSIX)				/* }{ */
+#elif defined(LUA_USE_ULONGJMP)				/* }{ */
 
 /* in POSIX, try _longjmp/_setjmp (more efficient) */
 #define LUAI_THROW(L,c)		_longjmp((c)->b, 1)
diff -Nurd lua-5.3/src/liolib.c lua-5.3/src/liolib.c
--- lua-5.3/src/liolib.c	2015-01-30 22:34:26.329033992 +0200
+++ lua-5.3/src/liolib.c	2015-02-14 22:33:35.100734420 +0200
@@ -47,7 +47,7 @@
 
 #if !defined(l_popen)		/* { */
 
-#if defined(LUA_USE_POSIX)	/* { */
+#if defined(LUA_USE_POPEN)      /* { */
 
 #define l_popen(L,c,m)		(fflush(NULL), popen(c,m))
 #define l_pclose(L,file)	(pclose(file))
4 22:33:05.196735076 +0200
+++ lua-5.3/src/loslib.c	2015-02-14 22:32:40.8007356114 22:33:05.196735076 +0200
+++ lua-5.3/src/luaconf.h	2015-02-14 22:32:40.800735611ENDREP
DELTA 27508 22365 1425
SVN  ›%›*
 ˆ	 Š “ˆPEN)      ENDREP
DELTA 25888 498373 21992
SVN  «W¯)`‰]¬ W,€r ˆ5_ˆ bŠ… ˆV‹€w r–9€‚ ¥˜€X n½3€M PÀ> ‘*Á¾ I¿{´ » Ó  ƒLŽ!ˆ Œ‘p ‚užp„ ‰h¡o/*
** $Id: ldo.c,v 2.135 2014/11/11 17:13:39#define ldo_c
#define LUA_CORE

#include "lprefix.h"


#include <setjmp.h>
#include <stdlib.h>
#include <string.h>ULONGJMPISO Cglobal_State *g = G(L);
    L->status = cast_byte(errcode);  /* mark it as dead */
    if (g->mainthread->errorJmp) {  /* main thread has a handler? */
      setobjs2s(L, g->mainthread->top++, L->top - 1);  /* copy error obj. */
      luaD_throw(gg->panic) {  /* panic function? */
        seterrorobj(L, errcode, L->top);  /* assume EXTRA_STACK */
        if (L->ci->top < L->top)
          L->ci->top = L->top;  /* pushing msg. can break this invariant */
        lua_unlock(L);
        g->panic(L);  /* call panic function/*
** Check whether __call metafield of 'func' is a function. If so, put
** it in stack below original 'func' so that 'luaD_precall' can call
** it. Raise an error if __call metafield is not a function.
*/
static voiif (!ttisfunction(tm))
    luaG_typeerror(L, func, "call");
  /* Open a hole inside the stack at 'func' */
  for (p = L->top; p > func; p--)
    setobjs2s(L, p, p-1);
  L->top++;  /* slot ensured by callerluaD_checkstack(L, 1);  /* ensure space for metamethod */
        tryfuncTM(L, func);  /* try to get '__call' meta'KContext''%s'ENDREP
DELTA 28184 0 328
SVN  ƒ”fƒ”f ‚² Œ â;‚²+popen pcloseENDREP
id: 19qx.5qi.r28186/2719
type: file
pred: 19qx.5qi.r28150/743
count: 3
text: 28186 96 1084 1940 3e5e9684a39f57de3ca03f2fa7c51d73
cpath: /branches/S2_6/dependencies/lua-5.3/freeciv_lua.patch
copyroot: 27474 /branches/S2_6

id: 19rn.5qi.r28186/2941
type: file
pred: 19rn.5qi.r27508/26561
count: 5
text: 28186 1206 34 19882 d20cfb5cbff534a37c0433db41c2679c
props: 26905 185403 34 0 25e6c2f7558b7484000d4d090dea5b92
cpath: /branches/S2_6/dependencies/lua-5.3/src/liolib.c
copyroot: 27474 /branches/S2_6

id: 19rf.5qi.r28186/3219
type: file
pred: 19rf.5ck.r27411/42086
count: 4
text: 28186 1270 1355 22441 379f30d87112d4c6a958491bb8219aac
props: 26905 178808 34 0 25e6c2f7558b7484000d4d090dea5b92
cpath: /branches/S2_6/dependencies/lua-5.3/src/ldo.c
copyroot: 27474 /branches/S2_6

id: 19rx.5qi.r28186/3496
type: file
pred: 19rx.5ck.r26905/176012
count: 2
text: 28186 0 65 1177 9329060668d7570a5e35e9766318434f
props: 26905 175965 34 0 25e6c2f7558b7484000d4d090dea5b92
cpath: /branches/S2_6/dependencies/lua-5.3/src/localluaconf.h
copyroot: 27474 /branches/S2_6

PLAIN
K 11
Makefile.am
V 23
file 19qz.5ck.r27466/56
K 6
lapi.c
V 26
file 19r1.5qi.r27508/25440
K 6
lapi.h
V 27
file 19r2.5ck.r26905/181367
K 9
lauxlib.c
V 26
file 19r3.5ck.r27411/38920
K 9
lauxlib.h
V 26
file 19r4.5ck.r27411/39971
K 10
lbaselib.c
V 26
file 19r5.5ck.r27411/41293
K 9
lbitlib.c
V 26
file 19r6.5ck.r27411/42611
K 7
lcode.c
V 26
file 19r7.5qi.r27508/27401
K 7
lcode.h
V 27
file 19r8.5ck.r26905/172226
K 10
lcorolib.c
V 26
file 19r9.5ck.r27411/45237
K 8
lctype.c
V 26
file 19ra.5ck.r27411/38656
K 8
lctype.h
V 27
file 19rb.5ck.r26905/175381
K 8
ldblib.c
V 26
file 19rc.5qi.r27508/27957
K 8
ldebug.c
V 26
file 19rd.5qi.r27508/25997
K 8
ldebug.h
V 26
file 19re.5ck.r27411/46033
K 5
ldo.c
V 25
file 19rf.5qi.r28186/3219
K 5
ldo.h
V 26
file 19rg.5ck.r27411/43136
K 7
ldump.c
V 26
file 19rh.5ck.r27411/42348
K 7
lfunc.c
V 26
file 19ri.5ck.r27411/45769
K 7
lfunc.h
V 27
file 19rj.5ck.r26905/185767
K 5
lgc.c
V 26
file 19rk.5ck.r27411/44975
K 5
lgc.h
V 26
file 19rl.5ck.r27411/46829
K 7
linit.c
V 25
file 19rm.5qi.r27593/6977
K 8
liolib.c
V 25
file 19rn.5qi.r28186/2941
K 6
llex.c
V 26
file 19ro.5ck.r27411/39710
K 6
llex.h
V 26
file 19rp.5ck.r27411/40501
K 9
llimits.h
V 26
file 19rq.5ck.r27411/47887
K 10
lmathlib.c
V 26
file 19rr.5qi.r27508/28238
K 6
lmem.c
V 26
file 19rs.5ck.r27411/50009
K 6
lmem.h
V 26
file 19rt.5ck.r27411/38394
K 9
loadlib.c
V 25
file 19ru.5qi.r27593/6417
K 9
lobject.c
V 26
file 19rv.5qi.r27508/26843
K 9
lobject.h
V 25
file 19rw.5qi.r27593/7253
K 14
localluaconf.h
V 25
file 19rx.5qi.r28186/3496
K 10
lopcodes.c
V 25
file 19ry.5qi.r27593/6698
K 10
lopcodes.h
V 26
file 19rz.5ck.r27411/41559
K 8
loslib.c
V 24
file 19s0.5qi.r28150/965
K 9
lparser.c
V 26
file 19s1.5qi.r27508/26279
K 9
lparser.h
V 26
file 19s2.5ck.r27411/47090
K 9
lprefix.h
V 26
file 1j4b.5qi.r27508/28802
K 8
lstate.c
V 26
file 19s3.5ck.r27411/50539
K 8
lstate.h
V 26
file 19s4.5ck.r27411/39187
K 9
lstring.c
V 26
file 19s5.5ck.r27411/48154
K 9
lstring.h
V 27
file 19s6.5ck.r26905/189236
K 9
lstrlib.c
V 26
file 19s7.5ck.r27411/41027
K 8
ltable.c
V 25
file 19s8.5qi.r27593/6138
K 8
ltable.h
V 26
file 19s9.5ck.r27008/36976
K 9
ltablib.c
V 26
file 19sa.5ck.r27411/40763
K 5
ltm.c
V 26
file 19sb.5ck.r27411/43923
K 5
ltm.h
V 26
file 19sc.5ck.r27411/44448
K 5
lua.h
V 26
file 19sd.5qi.r27508/27680
K 7
lua.hpp
V 27
file 19se.5ck.r25888/622391
K 9
luaconf.h
V 26
file 19sf.5qi.r27508/28520
K 8
lualib.h
V 27
file 19sg.5ck.r26905/186081
K 9
lundump.c
V 26
file 19sh.5ck.r27411/43396
K 9
lundump.h
V 27
file 19si.5ck.r26905/181053
K 10
lutf8lib.c
V 26
file 19sj.5ck.r27411/49743
K 5
lvm.c
V 26
file 19sk.5qi.r27508/25718
K 5
lvm.h
V 26
file 19sl.5ck.r27008/35924
K 6
lzio.c
V 26
file 19sm.5ck.r27411/41824
K 6
lzio.h
V 26
file 19sn.5ck.r27411/42874
END
ENDREP
id: 19qy.5qi.r28186/6530
type: dir
pred: 19qy.5qi.r28150/3995
count: 10
text: 28186 3777 2740 2740 8cc7ade2f78edcdf1e2c19cd513468d1
props: 28037 0 53 0 a527b216afb99426b763a1e313c531be
cpath: /branches/S2_6/dependencies/lua-5.3/src
copyroot: 27474 /branches/S2_6

PLAIN
K 11
Makefile.am
V 23
file 19qn.5qi.r27496/53
K 6
README
V 26
file 19qp.5qi.r27593/10504
K 7
Version
V 24
file 19qq.5qi.r27686/107
K 3
doc
V 25
dir 19qr.5qi.r27508/25229
K 17
freeciv_lua.patch
V 25
file 19qx.5qi.r28186/2719
K 3
src
V 24
dir 19qy.5qi.r28186/6530
END
ENDREP
id: 19ql.5qi.r28186/7073
type: dir
pred: 19ql.5qi.r28150/4534
count: 12
text: 28186 6794 266 266 f84e6898be36070739a9fbf37bc8cd87
props: 28037 606 47 0 c348519a2f02d6470452d3eca58ed415
cpath: /branches/S2_6/dependencies/lua-5.3
copyroot: 27474 /branches/S2_6

PLAIN
K 11
Makefile.am
V 23
file 31m.5qi.r27699/592
K 7
cvercmp
V 25
dir acu.5ck.r26905/199767
K 7
lua-5.3
V 24
dir 19ql.5qi.r28186/7073
K 6
luasql
V 23
dir 6k8.5r3.r27651/1907
K 2
m4
V 23
dir 4ef.5ck.r25384/7703
K 9
tolua-5.2
V 25
dir c6p.5ck.r26905/198751
END
ENDREP
id: 2yu.5qi.r28186/7602
type: dir
pred: 2yu.5qi.r28150/5062
count: 116
text: 28186 7333 256 256 a190a5f210d8743721ad7e04ae2484dc
props: 14844 2808 53 0 a527b216afb99426b763a1e313c531be
cpath: /branches/S2_6/dependencies
copyroot: 27474 /branches/S2_6

id: 149.5qi.r28186/7854
type: file
pred: 149.5qi.r28184/355
count: 459
text: 28186 2657 37 51814 e67718fdfdf2b783f6bb4fcd2cd8e4af
props: 10922 613 112 0 391fbfe6c7602972dbce1584a6808d2a
cpath: /branches/S2_6/configure.ac
copyroot: 27474 /branches/S2_6

PLAIN
K 9
ABOUT-NLS
V 24
file fu.5ck.r27270/69307
K 7
AUTHORS
V 24
file 5u.5ck.r22143/14016
K 7
COPYING
V 19
file 1h.0.r9643/400
K 9
ChangeLog
V 26
file 6l.5ck.r27473/7455495
K 7
INSTALL
V 21
file 6.5qi.r27778/886
K 11
Makefile.am
V 22
file 59.5ck.r27213/499
K 4
NEWS
V 24
file 6m.5ck.r25634/30702
K 6
README
V 20
file 7.0.r4421/96382
K 2
ai
V 22
dir 8.5qi.r28160/16241
K 10
autogen.sh
V 24
file 12o.5ck.r25794/4003
K 9
bootstrap
V 23
dir 2p5.5ck.r27114/4172
K 6
client
V 22
dir d.5qi.r28169/14234
K 6
common
V 22
dir p.5qi.r28160/14572
K 12
configure.ac
V 24
file 149.5qi.r28186/7854
K 4
data
V 21
dir w.5qi.r28174/4359
K 12
dependencies
V 23
dir 2yu.5qi.r28186/7602
K 3
doc
V 22
dir k7.5qi.r28170/2422
K 10
fc_version
V 25
file 2lo.5qj.r27866/91169
K 11
gen_headers
V 25
dir 1hsw.5qi.r28076/10854
K 2
m4
V 24
dir 12p.5qi.r28076/25737
K 7
scripts
V 23
dir 2yo.5ck.r27213/1366
K 6
server
V 22
dir z.5qi.r28175/41928
K 5
tests
V 22
dir 2g9.5ck.r27023/734
K 5
tools
V 23
dir 4pj.5qp.r28089/1206
K 12
translations
V 26
dir t0a.5qi.r28183/1043964
K 7
utility
V 23
dir 1c.5qi.r28076/10266
K 3
vms
V 25
dir u9.5ck.r21528/1396085
K 5
win32
V 23
dir 2eu.5ck.r27378/3030
END
ENDREP
id: 3.5qi.r28186/9280
type: dir
pred: 3.5qi.r28184/1777
count: 19151
text: 28186 8107 1160 1160 1a12ed615aac4c9a4339cfbe75f7e6ee
props: 28037 14463 292 0 9e1d5de0253c723466868990c52c129f
cpath: /branches/S2_6
copyroot: 27474 /branches/S2_6

PLAIN
K 5
S1_14
V 21
dir 3.21.r18109/18803
K 4
S2_0
V 21
dir 3.10x.r21862/4178
K 4
S2_1
V 22
dir 3.59e.r20026/11014
K 4
S2_2
V 21
dir 3.5cy.r21861/5036
K 4
S2_3
V 21
dir 3.5f2.r24391/5183
K 4
S2_4
V 24
dir 3.5ii.r28183/1049412
K 4
S2_5
V 24
dir 3.5kv.r28183/1038588
K 4
S2_6
V 21
dir 3.5qi.r28186/9280
K 11
freeciv-web
V 22
dir 3.5bl.r13594/14918
END
ENDREP
id: 1.0.r28186/9879
type: dir
pred: 1.0.r28184/2378
count: 8861
text: 28186 9521 345 345 3e17a929e87e2ccbbac1464c4481ba2a
cpath: /branches
copyroot: 0 /

PLAIN
K 8
branches
V 19
dir 1.0.r28186/9879
K 4
tags
V 19
dir 2.0.r27200/6414
K 5
trunk
V 21
dir 3.5ck.r28185/9178
K 7
website
V 21
dir 3ge.0.r22980/2263
END
ENDREP
id: 0.0.r28186/10198
type: dir
pred: 0.0.r28185/9571
count: 28186
text: 28186 10033 152 152 938ad32419ed1df8d17ce256593b0f15
cpath: /
copyroot: 0 /

19rf.5qi.t28185-1 modify true false /branches/S2_6/dependencies/lua-5.3/src/ldo.c

149.5qi.t28185-1 modify true false /branches/S2_6/configure.ac

19rx.5qi.t28185-1 modify true false /branches/S2_6/dependencies/lua-5.3/src/localluaconf.h

19qx.5qi.t28185-1 modify true false /branches/S2_6/dependencies/lua-5.3/freeciv_lua.patch

19rn.5qi.t28185-1 modify true false /branches/S2_6/dependencies/lua-5.3/src/liolib.c


10198 10347