diff options
| -rw-r--r-- | Docs/env.sh | 4 | ||||
| -rw-r--r-- | gtk/Makefile.defaults | 2 | ||||
| -rw-r--r-- | image/png.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Docs/env.sh b/Docs/env.sh index f5c421501..83a521970 100644 --- a/Docs/env.sh +++ b/Docs/env.sh @@ -41,7 +41,7 @@ fi # The GTK version to build for (either 2 or 3 currently) if [ "x${NETSURF_GTK_MAJOR}" = "x" ]; then - NETSURF_GTK_MAJOR=3 + NETSURF_GTK_MAJOR=2 fi @@ -129,7 +129,7 @@ export MAKE ################ OS Package installation ################ # deb packages for dpkg based systems -NS_DEV_DEB="build-essential pkg-config git gperf libcurl3-dev libpng-dev libjpeg-dev libmozjs185-dev" +NS_DEV_DEB="build-essential pkg-config git gperf libcurl3-dev libssl-dev libpng-dev libjpeg-dev libmozjs185-dev" NS_TOOL_DEB="flex bison libhtml-parser-perl" if [ "x${NETSURF_GTK_MAJOR}" = "x3" ]; then NS_GTK_DEB="libgtk-3-dev librsvg2-dev" diff --git a/gtk/Makefile.defaults b/gtk/Makefile.defaults index dc1203328..51aa02707 100644 --- a/gtk/Makefile.defaults +++ b/gtk/Makefile.defaults @@ -25,7 +25,7 @@ NETSURF_USE_ROSPRITE := AUTO NETSURF_FS_BACKING_STORE := YES # Set default GTK version to build for (2 or 3) -NETSURF_GTK_MAJOR := 2 +NETSURF_GTK_MAJOR ?= 2 # Optimisation levels CFLAGS += -O2 diff --git a/image/png.c b/image/png.c index 0f9b9cbc6..acf375e14 100644 --- a/image/png.c +++ b/image/png.c @@ -431,10 +431,10 @@ png_cache_convert(struct content *c) png_structp png_ptr; png_infop info_ptr; png_infop end_info_ptr; - volatile struct bitmap *bitmap = NULL; + volatile struct bitmap * volatile bitmap = NULL; struct png_cache_read_data_s png_cache_read_data; png_uint_32 width, height; - volatile png_bytep *row_pointers = NULL; + volatile png_bytep * volatile row_pointers = NULL; png_cache_read_data.data = content__get_source_data(c, &png_cache_read_data.size); |