source: contrib/GoogleGears/Linux-Firefox3.6/gears-r3420-ff3-ff36.patch @ 4070

gears/localserver/common/localserver_db.cc

@@ -25 +25 @@
 
 #include "gears/localserver/common/localserver_db.h"
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
 

gears/tools/rules.mk

@@ -315 +315 @@
   ifeq ($(ARCH),i386)
         # We don't build for 64-bit Firefox2 (but we do build for 32-bit Firefox2
         # and 64-bit Firefox3).
-        $(MAKE) prereqs    BROWSER=FF2
-        $(MAKE) genheaders BROWSER=FF2
-        $(MAKE) modules    BROWSER=FF2
+#       $(MAKE) prereqs    BROWSER=FF2
+#       $(MAKE) genheaders BROWSER=FF2
+#       $(MAKE) modules    BROWSER=FF2
   endif
 
         $(MAKE) prereqs    BROWSER=FF3
@@ -1277 +1277 @@
         "mkdir" -p $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff36
         "mkdir" -p $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff35
         "mkdir" -p $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff30
-        "mkdir" -p $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff2
+#       "mkdir" -p $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff2
         cp base/firefox/static_files/components/stub.js $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/components
         cp base/firefox/static_files/components/bootstrap.js $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/components
         cp base/firefox/static_files/lib/updater.js $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib
@@ -1301 +1301 @@
         cp $(FF31_MODULE_DLL) $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff35/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX)
         cp $(FF3_MODULE_DLL) $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff30/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX)
 ifneq ($(ARCH),x86_64)
-        cp $(FF2_MODULE_DLL) $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff2/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX)
+#       cp $(FF2_MODULE_DLL) $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/lib/ff2/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX)
 endif
 ifeq ($(OS),osx)
         cp $(OSX_LAUNCHURL_EXE) $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/resources/

gears/base/common/http_utils.cc

@@ -753 +753 @@
       const char *space = (char *) memchr(line, ' ', line_end - line);
       if (space) {
         char *errpos;
-        strtol(space + 1, &errpos, 10);
+                int asdf;
+        asdf = strtol(space + 1, &errpos, 10);
         if (isspace(*errpos) && errpos > space + 1) {
           good_first_line = true;
           num_headers++;

third_party/sqlite_google/src/os_unix.c

@@ -685 +685 @@
   ** the first page of the database, no damage is done.
   */
   if( statbuf.st_size==0 ){
-    write(fd, "S", 1);
+        int asdf;
+    asdf = write(fd, "S", 1);
     rc = fstat(fd, &statbuf);
     if( rc!=0 ){
       return SQLITE_IOERR;
@@ -2627 +2628 @@
       pid = getpid();
       memcpy(&zBuf[sizeof(t)], &pid, sizeof(pid));
     }else{
-      read(fd, zBuf, nBuf);
+          int asdf;
+      asdf = read(fd, zBuf, nBuf);
       close(fd);
     }
   }