From d411d14aed055a43f9562041fc8b593ce9bf52d0 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Sun, 31 Mar 2013 23:32:10 +0200 Subject: [PATCH] added generated file --- 3rdParty/zlib-1.2.7/Makefile | 20 ++++++++++---------- html/admin/js/bootstrap/module-internal.js | 1 + 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/3rdParty/zlib-1.2.7/Makefile b/3rdParty/zlib-1.2.7/Makefile index 6c499fad7b..6815f0c9c2 100644 --- a/3rdParty/zlib-1.2.7/Makefile +++ b/3rdParty/zlib-1.2.7/Makefile @@ -18,26 +18,26 @@ CC=gcc -CFLAGS=-O3 -DHAVE_HIDDEN +CFLAGS=-O3 -D_LARGEFILE64_SOURCE=1 -DHAVE_HIDDEN #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 #CFLAGS=-g -DDEBUG #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ # -Wstrict-prototypes -Wmissing-prototypes -SFLAGS=-O3 -fPIC -DHAVE_HIDDEN +SFLAGS=-O3 -fPIC -D_LARGEFILE64_SOURCE=1 -DHAVE_HIDDEN LDFLAGS= TEST_LDFLAGS=-L. libz.a -LDSHARED=gcc -dynamiclib -install_name ${exec_prefix}/lib/libz.1.dylib -compatibility_version 1 -current_version 1.2.7 +LDSHARED=gcc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map CPP=gcc -E STATICLIB=libz.a -SHAREDLIB=libz.dylib -SHAREDLIBV=libz.1.2.7.dylib -SHAREDLIBM=libz.1.dylib +SHAREDLIB=libz.so +SHAREDLIBV=libz.so.1.2.7 +SHAREDLIBM=libz.so.1 LIBS=$(STATICLIB) $(SHAREDLIBV) -AR=/usr/bin/libtool -ARFLAGS=-o +AR=ar +ARFLAGS=rc RANLIB=ranlib LDCONFIG=ldconfig LDSHAREDLIBC=-lc @@ -70,7 +70,7 @@ OBJS = $(OBJC) $(OBJA) PIC_OBJS = $(PIC_OBJC) $(PIC_OBJA) -all: static shared +all: static shared all64 static: example$(EXE) minigzip$(EXE) @@ -80,7 +80,7 @@ all64: example64$(EXE) minigzip64$(EXE) check: test -test: all teststatic testshared +test: all teststatic testshared test64 teststatic: static @TMPST=`mktemp fooXXXXXX`; \ diff --git a/html/admin/js/bootstrap/module-internal.js b/html/admin/js/bootstrap/module-internal.js index 600ad5b5a6..80b30fbde4 100644 --- a/html/admin/js/bootstrap/module-internal.js +++ b/html/admin/js/bootstrap/module-internal.js @@ -437,6 +437,7 @@ //////////////////////////////////////////////////////////////////////////////// exports.setUnitTestsResult = function (value) { + // do not use strict here SYS_UNIT_TESTS_RESULT = value; };