diff options
| author | Thomas Groman <tgroman@nuegia.net> | 2020-08-23 17:15:35 -0700 |
|---|---|---|
| committer | Thomas Groman <tgroman@nuegia.net> | 2020-08-23 18:10:05 -0700 |
| commit | e8dada8eff0b36a98b514af6adc039d2920a2109 (patch) | |
| tree | 4afe7a19db71a0ab714faac45ced87a457c36c77 /config | |
| parent | aaeaf52308b698084c978636b4f56f87d0603f49 (diff) | |
| download | UXP-e8dada8eff0b36a98b514af6adc039d2920a2109.tar UXP-e8dada8eff0b36a98b514af6adc039d2920a2109.tar.gz UXP-e8dada8eff0b36a98b514af6adc039d2920a2109.tar.lz UXP-e8dada8eff0b36a98b514af6adc039d2920a2109.tar.xz UXP-e8dada8eff0b36a98b514af6adc039d2920a2109.zip | |
Dick, YOU'RE FIRED!
Revert "Issue #1342 - Remove support for system libevent"
This reverts commit 90c5288fef22004d6e4d441b3ae10b9cd1836103.
Diffstat (limited to 'config')
| -rw-r--r-- | config/Makefile.in | 1 | ||||
| -rw-r--r-- | config/system-headers | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/config/Makefile.in b/config/Makefile.in index 93ad5a80c..cc4ab9df7 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -45,6 +45,7 @@ export:: $(export-preqs) -DMOZ_SYSTEM_BZ2=$(MOZ_SYSTEM_BZ2) \ -DMOZ_SYSTEM_ZLIB=$(MOZ_SYSTEM_ZLIB) \ -DMOZ_SYSTEM_JPEG=$(MOZ_SYSTEM_JPEG) \ + -DMOZ_SYSTEM_LIBEVENT=$(MOZ_SYSTEM_LIBEVENT) \ -DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \ $(srcdir)/system-headers $(srcdir)/stl-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers $(INSTALL) system_wrappers $(DIST) diff --git a/config/system-headers b/config/system-headers index 9dd33bc76..dbc95f6a2 100644 --- a/config/system-headers +++ b/config/system-headers @@ -1273,7 +1273,11 @@ 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 |