summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/Makefile.in1
-rw-r--r--config/milestone.txt2
-rw-r--r--config/system-headers4
3 files changed, 1 insertions, 6 deletions
diff --git a/config/Makefile.in b/config/Makefile.in
index 10807cfb9..1512520e4 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -46,7 +46,6 @@ export:: $(export-preqs)
-DMOZ_SYSTEM_ZLIB=$(MOZ_SYSTEM_ZLIB) \
-DMOZ_SYSTEM_PNG=$(MOZ_SYSTEM_PNG) \
-DMOZ_SYSTEM_JPEG=$(MOZ_SYSTEM_JPEG) \
- -DMOZ_SYSTEM_LIBEVENT=$(MOZ_SYSTEM_LIBEVENT) \
-DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \
-DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \
$(srcdir)/system-headers $(srcdir)/stl-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
diff --git a/config/milestone.txt b/config/milestone.txt
index e74505029..a99a9ac9f 100644
--- a/config/milestone.txt
+++ b/config/milestone.txt
@@ -10,4 +10,4 @@
# hardcoded milestones in the tree from these two files.
#--------------------------------------------------------
-4.5.0 \ No newline at end of file
+4.5.9 \ No newline at end of file
diff --git a/config/system-headers b/config/system-headers
index b10324f0f..29eef3210 100644
--- a/config/system-headers
+++ b/config/system-headers
@@ -1276,11 +1276,7 @@ bzlib.h
#ifdef MOZ_ENABLE_GIO
gio/gio.h
#endif
-#if MOZ_SYSTEM_LIBEVENT==1
-event.h
-#else
sys/event.h
-#endif
#ifdef MOZ_ENABLE_LIBPROXY
proxy.h
#endif