|
 |
9ccdfb |
diff -up ./esc/coreconf/Linux3.1.mk.fix12 ./esc/coreconf/Linux3.1.mk
|
|
|
9ccdfb |
--- ./esc/coreconf/Linux3.1.mk.fix12 2011-11-28 13:55:27.623816205 -0800
|
|
|
9ccdfb |
+++ ./esc/coreconf/Linux3.1.mk 2011-11-28 13:56:11.119536737 -0800
|
|
|
9ccdfb |
@@ -0,0 +1,35 @@
|
|
|
9ccdfb |
+# BEGIN COPYRIGHT BLOCK
|
|
|
9ccdfb |
+# This Program is free software; you can redistribute it and/or modify it under
|
|
|
9ccdfb |
+# the terms of the GNU General Public License as published by the Free Software
|
|
|
9ccdfb |
+# Foundation; version 2 of the License.
|
|
|
9ccdfb |
+#
|
|
|
9ccdfb |
+# This Program is distributed in the hope that it will be useful, but WITHOUT
|
|
|
9ccdfb |
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
|
9ccdfb |
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
|
|
9ccdfb |
+#
|
|
|
9ccdfb |
+# You should have received a copy of the GNU General Public License along with
|
|
|
9ccdfb |
+# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
|
|
|
9ccdfb |
+# Place, Suite 330, Boston, MA 02111-1307 USA.
|
|
|
9ccdfb |
+#
|
|
|
9ccdfb |
+# Copyright (C) 2005 Red Hat, Inc.
|
|
|
9ccdfb |
+# All rights reserved.
|
|
|
9ccdfb |
+# END COPYRIGHT BLOCK
|
|
|
9ccdfb |
+
|
|
|
9ccdfb |
+#
|
|
|
9ccdfb |
+# Config stuff for Linux 3.1 (ELF)
|
|
|
9ccdfb |
+#
|
|
|
9ccdfb |
+
|
|
|
9ccdfb |
+include $(CORE_DEPTH)/coreconf/Linux.mk
|
|
|
9ccdfb |
+
|
|
|
9ccdfb |
+OS_REL_CFLAGS += -DLINUX2_1
|
|
|
9ccdfb |
+MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
|
|
|
9ccdfb |
+ifdef BUILD_OPT
|
|
|
9ccdfb |
+ OPTIMIZER = -O2
|
|
|
9ccdfb |
+endif
|
|
|
9ccdfb |
+
|
|
|
9ccdfb |
+ifdef MAPFILE
|
|
|
9ccdfb |
+ MKSHLIB += -Wl,--version-script,$(MAPFILE)
|
|
|
9ccdfb |
+endif
|
|
|
9ccdfb |
+PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \
|
|
|
9ccdfb |
+ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
|
|
|
9ccdfb |
+
|
|
|
9ccdfb |
diff -up ./esc/src/app/xpcom/rhCoolKey.cpp.fix12 ./esc/src/app/xpcom/rhCoolKey.cpp
|
|
|
9ccdfb |
--- ./esc/src/app/xpcom/rhCoolKey.cpp.fix12 2011-11-28 19:29:53.894102752 -0800
|
|
|
9ccdfb |
+++ ./esc/src/app/xpcom/rhCoolKey.cpp 2011-11-28 19:30:46.003028405 -0800
|
|
|
9ccdfb |
@@ -41,7 +41,6 @@
|
|
|
9ccdfb |
#include "prlink.h"
|
|
|
9ccdfb |
#include "prthread.h"
|
|
|
9ccdfb |
#include "nscore.h"
|
|
|
9ccdfb |
-#include "nsCopySupport.h"
|
|
|
9ccdfb |
#include <vector>
|
|
|
9ccdfb |
#include <string>
|
|
|
9ccdfb |
#include <time.h>
|