1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00

Remove an unused variable from a header, because it now triggers

the linker on -current into an error about duplicate symbol -- as
two source-files include the same header.

Reported by:	pkg-fallout
Sponsored by:	United Marsupials
This commit is contained in:
Mikhail Teterin 2020-09-07 15:22:52 +00:00
parent f32e42fb8c
commit 477566849f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=547897

View File

@ -3,8 +3,6 @@ from LLVM10. I admit, that the original author's intent escapes
me here, so I cannot tell, if we have an actual bug remaining
in this code.
-mi
--- fpx/ptil_fpx.cpp 2013-09-02 11:45:00.000000000 -0400
+++ fpx/ptil_fpx.cpp 2020-03-17 18:11:00.425447000 -0400
@@ -1200,7 +1200,7 @@
@ -18,3 +16,15 @@ in this code.
+ }
}
The variable No_JPEG_Header_Flag is unused. But its mere presence may
cause a "duplicate symbol" error from linker, when it tries to link
together object files compiled after #include-ing the ejpeg.h header.
--- jpeg/ejpeg.h 2013-09-02 11:45:00.000000000 -0400
+++ jpeg/ejpeg.h 2020-09-07 10:50:07.600375000 -0400
@@ -31,5 +31,2 @@
#define IMG_FORMAT_1111 0x04 /* Four-component non-interleaved image */
#define IMG_FORMAT_411 0x05 /* Three-component 4:1:1 image */
-
-JPEGEXPORT
-int No_JPEG_Header_Flag;