duplicate definition of "jdiv_round_up"

[GWRon]

Tried to compile something with NG for 64bit on linux and got this:

ar: Erzeugen von /BlitzMaxNG/mod/wx.mod/wxsplitterwindow.mod/wxsplitterwindow.release.linux.x64.a
ar: Erzeugen von /BlitzMaxNG/mod/wx.mod/wxlistctrl.mod/wxlistctrl.release.linux.x64.a
/BlitzMaxNG/mod/wx.mod/wx.mod/../lib/linuxx64/libwxjpeg-3.1.a(wxjpeg_jutils.o): In Funktion `jdiv_round_up':
jutils.c:(.text+0x0): Mehrfachdefinition von `jdiv_round_up'
/BlitzMaxNG/mod/pub.mod/libjpeg.mod/libjpeg.release.linux.x64.a(jutils.c.release.linux.x64.o):jutils.c:(.text+0x0): first defined here
/BlitzMaxNG/mod/wx.mod/wx.mod/../lib/linuxx64/libwxjpeg-3.1.a(wxjpeg_jutils.o): In Funktion `jround_up':
jutils.c:(.text+0x10): Mehrfachdefinition von `jround_up'
/BlitzMaxNG/mod/pub.mod/libjpeg.mod/libjpeg.release.linux.x64.a(jutils.c.release.linux.x64.o):jutils.c:(.text+0x10): first defined here
/BlitzMaxNG/mod/wx.mod/wx.mod/../lib/linuxx64/libwxjpeg-3.1.a(wxjpeg_jutils.o): In Funktion `jcopy_sample_rows':
jutils.c:(.text+0x30): Mehrfachdefinition von `jcopy_sample_rows'
/BlitzMaxNG/mod/pub.mod/libjpeg.mod/libjpeg.release.linux.x64.a(jutils.c.release.linux.x64.o):jutils.c:(.text+0x30): first defined here
/BlitzMaxNG/mod/wx.mod/wx.mod/../lib/linuxx64/libwxjpeg-3.1.a(wxjpeg_jutils.o): In Funktion `jcopy_block_row':
jutils.c:(.text+0x90): Mehrfachdefinition von `jcopy_block_row'
/BlitzMaxNG/mod/pub.mod/libjpeg.mod/libjpeg.release.linux.x64.a(jutils.c.release.linux.x64.o):jutils.c:(.text+0x90): first defined here
/BlitzMaxNG/mod/wx.mod/wx.mod/../lib/linuxx64/libwxjpeg-3.1.a(wxjpeg_jutils.o):(.rodata+0x420): Mehrfachdefinition von `jpeg_natural_order'
/BlitzMaxNG/mod/pub.mod/libjpeg.mod/libjpeg.release.linux.x64.a(jutils.c.release.linux.x64.o):(.rodata+0x0): first defined here
collect2: error: ld returned 1 exit status
Build Error: Failed to link /TVTower.git/tools/editor2/editor

[GWRon]

I have this with vanilla too (32bit and 64 bit environment - albeit this does not change things). So for me it is broken with NG and vanilla. It is working for you @woollybah though?

[woollybah]

libjpeg functions are meant to be prefixed so as not to clash. It may be that some wx versions of the functions have been missed...

[GWRon]

Ok, feel free to fix this issue 🤣

[GWRon]

Would you mind spending some sparetime on recompiling the libraries - or write up a little instruction on how the module-users should do it on their own?

[GWRon]

ahem... anyone else having some ideas to fix this meanwhile (adjusting libjpeg.mod to skip recompilation the wx-module-libraries) ?

[GWRon]

Is this still valid?

https://github.com/maxmods/wx.mod/blob/master/wx.mod/wxWidgets_BuildNotes.txt

So ... should the "duplicate definitions" be added there?

[GWRon]

Ok, so I tried to compile the modules now (installing -dev packages etc done).

I copied the "#define"-lines in the wxWidgets_BuildNotes.txt to wxwidgets/src/jpeg/jpeglib.h - tried it before the final "#endif" and also after that line.

Next to your lines I added what was reported "duplicate" in my case:

#define jpeg_natural_order	wx_jpeg_natural_order
#define jinit_marker_reader	wx_jinit_marker_reader
#define jdiv_round_up	wx_jdiv_round_up
#define jround_up	wx_jround_up
#define jcopy_sample_rows	wx_jcopy_sample_rows
#define jcopy_block_row	wx_jcopy_block_row
#endif /* WXWIDGETS_JPEG_EXTERNAL_NAMES */

Nonetheless during "make" (of course I "make clean"'d before) I receive this:

/home/ronny/Downloads/wxWidgets-3.1.1/bk-deps gcc -c -o wxjpeg_jcapimin.o -DNDEBUG   -D_FILE_OFFSET_BITS=64 -I/home/ronny/Downloads/wxWidgets-3.1.1/lib/wx/include/gtk3-unicode-static-3.1 -I./include -pthread -I/usr/include/gtk-3.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/mirclient -I/usr/include/mircore -I/usr/include/mircookie -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng12 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -pthread -I/usr/include/gstreamer-1.0 -I/usr/lib/x86_64-linux-gnu/gstreamer-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -pthread -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/mirclient -I/usr/include/mircore -I/usr/include/mircookie -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng12 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/webkitgtk-4.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -pthread -Wall -Wundef -O2 -pthread -I/usr/include/gtk-3.0/unix-print -I/usr/include/gtk-3.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/mirclient -I/usr/include/mircore -I/usr/include/mircookie -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng12 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -D_GNU_SOURCE -DZ_PREFIX -DWXWIDGETS_JPEG_EXTERNAL_NAMES  ./src/jpeg/jcapimin.c
In file included from ./src/jpeg/jcapimin.c:22:0:
./src/jpeg/jcapimin.c: In function ‘wx_jpeg_CreateCompress’:
./src/jpeg/jpeglib.h:1239:28: error: ‘wx_jpeg_natural_order’ undeclared (first use in this function)
 #define jpeg_natural_order wx_jpeg_natural_order
                            ^
./src/jpeg/jcapimin.c:79:26: note: in expansion of macro ‘jpeg_natural_order’
   cinfo->natural_order = jpeg_natural_order;
                          ^
./src/jpeg/jpeglib.h:1239:28: note: each undeclared identifier is reported only once for each function it appears in
 #define jpeg_natural_order wx_jpeg_natural_order
                            ^
./src/jpeg/jcapimin.c:79:26: note: in expansion of macro ‘jpeg_natural_order’
   cinfo->natural_order = jpeg_natural_order;
                          ^
./src/jpeg/jcapimin.c: In function ‘wx_jpeg_destroy_compress’:
./src/jpeg/jpeglib.h:1236:22: warning: implicit declaration of function ‘wx_jpeg_destroy’ [-Wimplicit-function-declaration]
 #define jpeg_destroy wx_jpeg_destroy
                      ^
./src/jpeg/jcapimin.c:98:3: note: in expansion of macro ‘jpeg_destroy’
   jpeg_destroy((j_common_ptr) cinfo); /* use common routine */
   ^
./src/jpeg/jcapimin.c: In function ‘wx_jpeg_abort_compress’:
./src/jpeg/jpeglib.h:1235:20: warning: implicit declaration of function ‘wx_jpeg_abort’ [-Wimplicit-function-declaration]
 #define jpeg_abort wx_jpeg_abort
                    ^
./src/jpeg/jcapimin.c:110:3: note: in expansion of macro ‘jpeg_abort’
   jpeg_abort((j_common_ptr) cinfo); /* use common routine */
   ^
Makefile:15317: die Regel für Ziel „wxjpeg_jcapimin.o“ scheiterte
make: *** [wxjpeg_jcapimin.o] Fehler 1

Removing my custom added lines, it errors out on one of your listed "aliases":

In file included from ./src/jpeg/jdatasrc.c:20:0:
./src/jpeg/jdatasrc.c: In function ‘wx_jpeg_stdio_src’:
./src/jpeg/jpeglib.h:1237:32: error: ‘wx_jpeg_resync_to_restart’ undeclared (first use in this function)
 #define jpeg_resync_to_restart wx_jpeg_resync_to_restart
                                ^
./src/jpeg/jdatasrc.c:235:32: note: in expansion of macro ‘jpeg_resync_to_restart’
   src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */
                                ^
./src/jpeg/jpeglib.h:1237:32: note: each undeclared identifier is reported only once for each function it appears in
 #define jpeg_resync_to_restart wx_jpeg_resync_to_restart
                                ^
./src/jpeg/jdatasrc.c:235:32: note: in expansion of macro ‘jpeg_resync_to_restart’
   src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */
                                ^
./src/jpeg/jdatasrc.c: In function ‘wx_jpeg_mem_src’:
./src/jpeg/jpeglib.h:1237:32: error: ‘wx_jpeg_resync_to_restart’ undeclared (first use in this function)
 #define jpeg_resync_to_restart wx_jpeg_resync_to_restart
                                ^
./src/jpeg/jdatasrc.c:271:28: note: in expansion of macro ‘jpeg_resync_to_restart’
   src->resync_to_restart = jpeg_resync_to_restart; /* use default method */
                            ^
Makefile:15377: die Regel für Ziel „wxjpeg_jdatasrc.o“ scheiterte
make: *** [wxjpeg_jdatasrc.o] Fehler 1

What steps did I miss to do?

[GWRon]

Seems the aliases must be put on top of the .h file, not somewhere at/near the bottom.