[4070] | 1 | Index: gears/localserver/common/localserver_db.cc |
---|
| 2 | =================================================================== |
---|
| 3 | --- gears/localserver/common/localserver_db.cc (revision 3420) |
---|
| 4 | +++ gears/localserver/common/localserver_db.cc (working copy) |
---|
| 5 | @@ -25,6 +25,7 @@ |
---|
| 6 | |
---|
| 7 | #include "gears/localserver/common/localserver_db.h" |
---|
| 8 | |
---|
| 9 | +#include <stdio.h> |
---|
| 10 | #include <stdlib.h> |
---|
| 11 | #include <time.h> |
---|
| 12 | |
---|
| 13 | Index: gears/tools/rules.mk |
---|
| 14 | =================================================================== |
---|
| 15 | --- gears/tools/rules.mk (revision 3420) |
---|
| 16 | +++ gears/tools/rules.mk (working copy) |
---|
| 17 | @@ -315,9 +315,9 @@ |
---|
| 18 | ifeq ($(ARCH),i386) |
---|
| 19 | # We don't build for 64-bit Firefox2 (but we do build for 32-bit Firefox2 |
---|
| 20 | # and 64-bit Firefox3). |
---|
| 21 | - $(MAKE) prereqs BROWSER=FF2 |
---|
| 22 | - $(MAKE) genheaders BROWSER=FF2 |
---|
| 23 | - $(MAKE) modules BROWSER=FF2 |
---|
| 24 | +# $(MAKE) prereqs BROWSER=FF2 |
---|
| 25 | +# $(MAKE) genheaders BROWSER=FF2 |
---|
| 26 | +# $(MAKE) modules BROWSER=FF2 |
---|
| 27 | endif |
---|
| 28 | |
---|
| 29 | $(MAKE) prereqs BROWSER=FF3 |
---|
| 30 | @@ -1277,7 +1277,7 @@ |
---|
| 31 | "mkdir" -p $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff36 |
---|
| 32 | "mkdir" -p $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff35 |
---|
| 33 | "mkdir" -p $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff30 |
---|
| 34 | - "mkdir" -p $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff2 |
---|
| 35 | +# "mkdir" -p $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff2 |
---|
| 36 | cp base/firefox/static_files/components/stub.js $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/components |
---|
| 37 | cp base/firefox/static_files/components/bootstrap.js $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/components |
---|
| 38 | cp base/firefox/static_files/lib/updater.js $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib |
---|
| 39 | @@ -1301,7 +1301,7 @@ |
---|
| 40 | cp $(FF31_MODULE_DLL) $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff35/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX) |
---|
| 41 | cp $(FF3_MODULE_DLL) $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff30/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX) |
---|
| 42 | ifneq ($(ARCH),x86_64) |
---|
| 43 | - cp $(FF2_MODULE_DLL) $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff2/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX) |
---|
| 44 | +# cp $(FF2_MODULE_DLL) $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff2/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX) |
---|
| 45 | endif |
---|
| 46 | ifeq ($(OS),osx) |
---|
| 47 | cp $(OSX_LAUNCHURL_EXE) $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/resources/ |
---|
| 48 | Index: gears/base/common/http_utils.cc |
---|
| 49 | =================================================================== |
---|
| 50 | --- gears/base/common/http_utils.cc (revision 3420) |
---|
| 51 | +++ gears/base/common/http_utils.cc (working copy) |
---|
| 52 | @@ -753,7 +753,8 @@ |
---|
| 53 | const char *space = (char *) memchr(line, ' ', line_end - line); |
---|
| 54 | if (space) { |
---|
| 55 | char *errpos; |
---|
| 56 | - strtol(space + 1, &errpos, 10); |
---|
| 57 | + int asdf; |
---|
| 58 | + asdf = strtol(space + 1, &errpos, 10); |
---|
| 59 | if (isspace(*errpos) && errpos > space + 1) { |
---|
| 60 | good_first_line = true; |
---|
| 61 | num_headers++; |
---|
| 62 | Index: third_party/sqlite_google/src/os_unix.c |
---|
| 63 | =================================================================== |
---|
| 64 | --- third_party/sqlite_google/src/os_unix.c (revision 3420) |
---|
| 65 | +++ third_party/sqlite_google/src/os_unix.c (working copy) |
---|
| 66 | @@ -685,7 +685,8 @@ |
---|
| 67 | ** the first page of the database, no damage is done. |
---|
| 68 | */ |
---|
| 69 | if( statbuf.st_size==0 ){ |
---|
| 70 | - write(fd, "S", 1); |
---|
| 71 | + int asdf; |
---|
| 72 | + asdf = write(fd, "S", 1); |
---|
| 73 | rc = fstat(fd, &statbuf); |
---|
| 74 | if( rc!=0 ){ |
---|
| 75 | return SQLITE_IOERR; |
---|
| 76 | @@ -2627,7 +2628,8 @@ |
---|
| 77 | pid = getpid(); |
---|
| 78 | memcpy(&zBuf[sizeof(t)], &pid, sizeof(pid)); |
---|
| 79 | }else{ |
---|
| 80 | - read(fd, zBuf, nBuf); |
---|
| 81 | + int asdf; |
---|
| 82 | + asdf = read(fd, zBuf, nBuf); |
---|
| 83 | close(fd); |
---|
| 84 | } |
---|
| 85 | } |
---|