DELTA 27508 1673 630 SVN} n sMKSTEMPENDREP DELTA 25888 1606 838 SVN8sl(UVfRdiff -Nurd lua-5.3/src/loslib.c lua-5.3/src/loslib.c --- lua-5.3/src/loslib.c 2015-02-12 21:13:58.132496638 +0200 +++ lua-5.3/src/loslib.c 2015-02-12 21:12:52.020498089 +0200 @@ -58,7 +58,7 @@ ** uses mkstemp. */ -#if defined(LUA_USE_POSIX) /* { */ +#if defined(LUA_USE_MKSTEMP) /* { */ #include diff -Nurd lua-5.3/src/luaconf.h lua-5.3/src/luaconf.h --- lua-5.3/src/luaconf.h 2015-02-12 21:13:58.132496638 +0200 +++ lua-5.3/src/luaconf.h 2015-02-12 21:12:25.356498674 +02= @@ -61,14 +62,12 @@ #if defined(LUA_USE_LINUX) #if defined(LUA_USE_MACOSX) #define LUA_USE_POSIX #define LUA_USE_DLOPEN /* MacOSENDREP id: 19qx.5qi.r28150/743 type: file pred: 19qx.5ck.r27411/54187 count: 2 text: 28150 56 659 1051 85b8244371ad0b28008ab79f7122f546 cpath: /branches/S2_6/dependencies/lua-5.3/freeciv_lua.patch copyroot: 27474 /branches/S2_6 id: 19s0.5qi.r28150/965 type: file pred: 19s0.5qi.r27508/27122 count: 5 text: 28150 0 28 8703 a115e12056b3c6cd140cbce4576d7320 props: 26905 187927 34 0 25e6c2f7558b7484000d4d090dea5b92 cpath: /branches/S2_6/dependencies/lua-5.3/src/loslib.c 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 26 file 19rf.5ck.r27411/42086 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 26 file 19rn.5qi.r27508/26561 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 27 file 19rx.5ck.r26905/176012 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.r28150/3995 type: dir pred: 19qy.5qi.r28037/66 count: 9 text: 28150 1238 2744 2744 792322ab34c8907ede2322e994507501 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 24 file 19qx.5qi.r28150/743 K 3 src V 24 dir 19qy.5qi.r28150/3995 END ENDREP id: 19ql.5qi.r28150/4534 type: dir pred: 19ql.5qi.r28037/666 count: 11 text: 28150 4256 265 265 2e740f30adb509ff88ad841da33c081d 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.r28150/4534 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.r28150/5062 type: dir pred: 2yu.5qi.r28037/1191 count: 115 text: 28150 4793 256 256 e9d23aaa53c764dd4251b06fae5985f9 props: 14844 2808 53 0 a527b216afb99426b763a1e313c531be cpath: /branches/S2_6/dependencies 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 21 dir 8.5qi.r28093/3033 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 21 dir d.5qi.r28129/7082 K 6 common V 22 dir p.5qi.r28137/10090 K 12 configure.ac V 23 file 149.5qi.r27699/341 K 4 data V 21 dir w.5qi.r28147/4614 K 12 dependencies V 23 dir 2yu.5qi.r28150/5062 K 3 doc V 22 dir k7.5qi.r28137/4292 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 21 dir z.5qi.r28122/4690 K 5 tests V 22 dir 2g9.5ck.r27023/734 K 5 tools V 23 dir 4pj.5qp.r28089/1206 K 12 translations V 25 dir t0a.5qi.r28139/317142 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.r28150/6482 type: dir pred: 3.5qi.r28147/6027 count: 19138 text: 28150 5314 1155 1155 4995e6a2a0a073c5bc98be0ff8bc9799 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 22 dir 3.5ii.r28134/47030 K 4 S2_5 V 21 dir 3.5kv.r28148/6952 K 4 S2_6 V 21 dir 3.5qi.r28150/6482 K 11 freeciv-web V 22 dir 3.5bl.r13594/14918 END ENDREP id: 1.0.r28150/7076 type: dir pred: 1.0.r28148/7546 count: 8836 text: 28150 6723 340 340 8f674645db8f335fdc06d2b6f00959b1 cpath: /branches copyroot: 0 / PLAIN K 8 branches V 19 dir 1.0.r28150/7076 K 4 tags V 19 dir 2.0.r27200/6414 K 5 trunk V 21 dir 3.5ck.r28149/6432 K 7 website V 21 dir 3ge.0.r22980/2263 END ENDREP id: 0.0.r28150/7395 type: dir pred: 0.0.r28149/6822 count: 28150 text: 28150 7230 152 152 182e38f72ddf64d8d8b38325329d9e3a cpath: / copyroot: 0 / 19s0.5qi.t28149-1 modify true false /branches/S2_6/dependencies/lua-5.3/src/loslib.c 19qx.5qi.t28149-1 modify true false /branches/S2_6/dependencies/lua-5.3/freeciv_lua.patch 7395 7542