[Bug 41705] New: build fails in dpnet

https://bugs.winehq.org/show_bug.cgi?id=41705

Bug ID: 41705
           Summary: build fails in dpnet
           Product: Wine
           Version: 1.9.23
          Hardware: arm
                OS: Linux
            Status: UNCONFIRMED
          Severity: normal
          Priority: P2
         Component: -unknown
          Assignee: [e-mail]
          Reporter: [e-mail]
      Distribution: ---

After a long time i tried again to build wine on my OpenPandora. The build
fails with:

$ make
gcc -c -o address.o ../../../wine-git/dlls/dpnet/address.c -I.
-I../../../wine-git/dlls/dpnet \
  -I../../include -I../../../wine-git/include -D__WINESRC__ -D_REENTRANT -fPIC
-Wall -pipe \
  -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body
-Wignored-qualifiers \
  -Wstrict-prototypes -Wtype-limits -Wvla -Wwrite-strings -Wpointer-arith
-gdwarf-2 -g -DPANDORA -DHAVE_GLES -O3 -pipe -march=armv7-a -mtune=cortex-a8
-mfpu=neon -mfloat-abi=softfp -ftree-vectorize -ffast-math
-fsingle-precision-constant -fsigned-char -marm
In file included from ../../../wine-git/include/winsock2.h:47,
                 from ../../../wine-git/dlls/dpnet/dpnet_private.h:29,
                 from ../../../wine-git/dlls/dpnet/address.c:37:
../../../wine-git/include/winsock.h:408: error: redefinition of typedef
'SOCKADDR'
../../../wine-git/include/dpaddr.h:30: error: previous declaration of
'SOCKADDR' was here
Makefile:177: recipe for target 'address.o' failed
make: *** [address.o] Error 1

Please note: The build platform is arm:
$ uname -a
Linux arm-dev 3.2.83 #1314 Sun Oct 23 23:01:12 EEST 2016 armv7l GNU/Linux

$ gcc --version
arm-angstrom-linux-gnueabi-gcc (GCC) 4.3.6

The exactly same source builds fine on x86/x86_64.

[Bug 41705] build fails in dpnet

https://bugs.winehq.org/show_bug.cgi?id=41705

Nathan  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |[e-mail]

--- Comment #1 from Nathan  ---
I get similar build error messages.

[terminal snip]

make[1]: Entering directory `/opt/wine-1.9.23/dlls/dpnet'
gcc -c -o address.o address.c -I. -I../../include -D__WINESRC__ -D_REENTRANT
-fPIC -Wall -pipe \
  -fno-strict-aliasing -Wdeclaration-after-statement -Wstrict-prototypes
-Wwrite-strings \
  -Wpointer-arith -fno-omit-frame-pointer -O2
In file included from ../../include/winsock2.h:47,
                 from dpnet_private.h:29,
                 from address.c:37:
../../include/winsock.h:408: error: redefinition of typedef 'SOCKADDR'
../../include/dpaddr.h:30: error: previous declaration of 'SOCKADDR' was here
make[1]: *** [address.o] Error 1
make[1]: Leaving directory `/opt/wine-1.9.23/dlls/dpnet'
make: *** [dlls/dpnet] Error 2

[/terminal snip]

My system: Puppy Linux 4.3 (x86)
[command prompt] uname -r
2.6.30.5

[command prompt] ldd --version
ldd (GNU libc) 2.6.1

[Bug 41705] build fails in dpnet

https://bugs.winehq.org/show_bug.cgi?id=41705

--- Comment #2 from Bruno Jesus  ---
> From winsock.h (WS prefix removed):

404 typedef struct sockaddr
 405 {
 406         u_short sa_family;
 407         char        sa_data[14];
 408 } SOCKADDR, *PSOCKADDR, *LPSOCKADDR;
> From dpaddr.h:

30 typedef struct sockaddr SOCKADDR;

The definitions should be compatible. Could this be related to older compilers
or a missing compiler option?

[Bug 41705] build fails in dpnet

https://bugs.winehq.org/show_bug.cgi?id=41705

Alistair Leslie-Hughes  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |[e-mail]

--- Comment #3 from Alistair Leslie-Hughes  ---
(In reply to Bruno Jesus from comment #2)
> From winsock.h (WS prefix removed):
>
> 404 typedef struct sockaddr
>  405 {
>  406         u_short sa_family;
>  407         char        sa_data[14];
>  408 } SOCKADDR, *PSOCKADDR, *LPSOCKADDR;
>
> From dpaddr.h:
>
> 30 typedef struct sockaddr SOCKADDR;
>
> The definitions should be compatible. Could this be related to older
> compilers or a missing compiler option?

Does adding the following to the Makefile.in help? (ensure you build from the
wine directory so the Makefile is rebuilt)
EXTRADEFS = -DUSE_WS_PREFIX

[Bug 41705] build fails in dpnet

https://bugs.winehq.org/show_bug.cgi?id=41705

--- Comment #4 from Stefan Leichter  ---
(In reply to Alistair Leslie-Hughes from comment #3)
> Does adding the following to the Makefile.in help? (ensure you build from
> the wine directory so the Makefile is rebuilt)
> EXTRADEFS = -DUSE_WS_PREFIX

The EXTRADEFS do not help for me

make[1]: Entering directory '/sle3/src/wine/wine-cdevtools/dlls/dpnet'
gcc -c -o address.o ../../../wine-git/dlls/dpnet/address.c -I.
-I../../../wine-git/dlls/dpnet \
  -I../../include -I../../../wine-git/include -D__WINESRC__ -DUSE_WS_PREFIX
-D_REENTRANT -fPIC -Wall \
  -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body
-Wignored-qualifiers \
  -Wstrict-prototypes -Wtype-limits -Wvla -Wwrite-strings -Wpointer-arith
-gdwarf-2 -g -DPANDORA -DHAVE_GLES -O3 -pipe -march=armv7-a -mtune=cortex-a8
-mfpu=neon -mfloat-abi=softfp -ftree-vectorize -ffast-math
-fsingle-precision-constant -fsigned-char -marm
In file included from ../../../wine-git/include/winsock2.h:47,
                 from ../../../wine-git/dlls/dpnet/dpnet_private.h:29,
                 from ../../../wine-git/dlls/dpnet/address.c:37:
../../../wine-git/include/winsock.h:408: error: conflicting types for
'SOCKADDR'
../../../wine-git/include/dpaddr.h:30: error: previous declaration of
'SOCKADDR' was here
Makefile:178: recipe for target 'address.o' failed
make[1]: *** [address.o] Error 1

[Bug 41705] build fails in dpnet

https://bugs.winehq.org/show_bug.cgi?id=41705

--- Comment #5 from Bruno Jesus  ---
The WS_ prefix requires source code changes so just setting the define will not
solve the issue.

What is the compiler name and version used?

[Bug 41705] build fails in dpnet

https://bugs.winehq.org/show_bug.cgi?id=41705

--- Comment #6 from Stefan Leichter  ---
(In reply to Bruno Jesus from comment #5)
> The WS_ prefix requires source code changes so just setting the define will
> not solve the issue.
>
> What is the compiler name and version used?

$ gcc --version
arm-angstrom-linux-gnueabi-gcc (GCC) 4.3.6

[Bug 41705] build fails in dpnet

https://bugs.winehq.org/show_bug.cgi?id=41705

--- Comment #7 from Nathan  ---
[command prompt] gcc --version
gcc (GCC) 4.2.2

[Bug 41705] build fails in dpnet

https://bugs.winehq.org/show_bug.cgi?id=41705

--- Comment #8 from Alistair Leslie-Hughes  ---
Created attachment 56125
  --> https://bugs.winehq.org/attachment.cgi?id=56125
Stop redefining of SOCKADDR

Does this patch help things?

[Bug 41705] build fails in dpnet

https://bugs.winehq.org/show_bug.cgi?id=41705

--- Comment #9 from Bruno Jesus  ---
(In reply to Alistair Leslie-Hughes from comment #8)
> Created attachment 56125 [details]
> Stop redefining of SOCKADDR
>
> Does this patch help things?

+#ifndef SOCKADDR
 typedef struct sockaddr SOCKADDR;
+#endif

I don't think it will work because SOCKADDR was not defined, it is just a
typedef.

[Bug 41705] build fails in dpnet

https://bugs.winehq.org/show_bug.cgi?id=41705

Alistair Leslie-Hughes  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
  Attachment #56125|0                           |1
        is obsolete|                            |

--- Comment #10 from Alistair Leslie-Hughes  ---
Created attachment 56127
  --> https://bugs.winehq.org/attachment.cgi?id=56127
Stop redefining of SOCKADDR - try 2

[Bug 41705] build fails in dpnet

https://bugs.winehq.org/show_bug.cgi?id=41705

--- Comment #11 from Stefan Leichter  ---
(In reply to Alistair Leslie-Hughes from comment #10)
> Created attachment 56127 [details]
> Stop redefining of SOCKADDR - try 2

Works fine for me, thank you

make[1]: Entering directory '/sle3/src/wine/wine-cdevtools/dlls/dpnet'
gcc -c -o address.o ../../../wine-git/dlls/dpnet/address.c -I.
-I../../../wine-git/dlls/dpnet \
  -I../../include -I../../../wine-git/include -D__WINESRC__ -D_REENTRANT -fPIC
-Wall -pipe \
  -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body
-Wignored-qualifiers \
  -Wstrict-prototypes -Wtype-limits -Wvla -Wwrite-strings -Wpointer-arith
-gdwarf-2 -g -DPANDORA -DHAVE_GLES -O3 -pipe -march=armv7-a -mtune=cortex-a8
-mfpu=neon -mfloat-abi=softfp -ftree-vectorize -ffast-mat
h -fsingle-precision-constant -fsigned-char -marm
../../tools/winegcc/winegcc -o dpnet.dll.so -B../../tools/winebuild -marm
-fasynchronous-unwind-tables -shared ../../../wine-git/dlls/dpnet/dpnet.spec \
  address.o client.o dpnet_main.o lobbiedapp.o peer.o server.o threadpool.o
version.res dpnet_r.res \
  ../../dlls/dxguid/libdxguid.a ../../dlls/uuid/libuuid.a -lole32 -ladvapi32
-lws2_32 \
  ../../libs/port/libwine_port.a 
../../tools/winegcc/winegcc -o dpnet.dll.fake -B../../tools/winebuild -marm
-fasynchronous-unwind-tables -shared ../../../wine-git/dlls/dpnet/dpnet.spec \
  address.o client.o dpnet_main.o lobbiedapp.o peer.o server.o threadpool.o
version.res dpnet_r.res \
  ../../dlls/dxguid/libdxguid.a ../../dlls/uuid/libuuid.a -lole32 -ladvapi32
-lws2_32 \
  ../../libs/port/libwine_port.a 
make[1]: Leaving directory '/sle3/src/wine/wine-cdevtools/dlls/dpnet'

[Bug 41705] build fails in dpnet

https://bugs.winehq.org/show_bug.cgi?id=41705

--- Comment #12 from Nathan  ---
Would it be possible for you to convert that attachment into a patch?

[Bug 41705] build fails in dpnet

https://bugs.winehq.org/show_bug.cgi?id=41705

Alistair Leslie-Hughes  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
          Component|-unknown                    |directx-dplay
             Status|UNCONFIRMED                 |NEW
     Ever confirmed|0                           |1

--- Comment #13 from Alistair Leslie-Hughes  ---
(In reply to Nathan from comment #12)
> Would it be possible for you to convert that attachment into a patch?

The attachment is a patch.

Ill send it through to winedevel shortly.

[Bug 41705] build fails in dpnet

https://bugs.winehq.org/show_bug.cgi?id=41705

Alistair Leslie-Hughes  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |[e-mail]

--- Comment #14 from Alistair Leslie-Hughes  ---
*** Bug 41730 has been marked as a duplicate of this bug. ***

[Bug 41705] Build fails in dpnet: redefinition of typedef 'SOCKADDR'

https://bugs.winehq.org/show_bug.cgi?id=41705

Bruno Jesus  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
            Summary|build fails in dpnet        |Build fails in dpnet:
                   |                            |redefinition of typedef
                   |                            |'SOCKADDR'

--- Comment #15 from Bruno Jesus  ---
Should be fixed by
http://source.winehq.org/git/wine.git/?a=commit;h=5cd33bf892f3a7599f37dba64b...

[Bug 41705] Build fails in dpnet: redefinition of typedef 'SOCKADDR'

https://bugs.winehq.org/show_bug.cgi?id=41705

Stefan Leichter  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|---                         |FIXED

--- Comment #16 from Stefan Leichter  ---
Confirming fixed

[Bug 41705] Build fails in dpnet: redefinition of typedef 'SOCKADDR'

https://bugs.winehq.org/show_bug.cgi?id=41705

Bruno Jesus  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
      Fixed by SHA1|                            |5cd33bf892f3a7599f37dba64b1
                   |                            |046f22b95af6a

[Bug 41705] Build fails in dpnet: redefinition of typedef 'SOCKADDR'

https://bugs.winehq.org/show_bug.cgi?id=41705

Alexandre Julliard  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|RESOLVED                    |CLOSED

--- Comment #17 from Alexandre Julliard  ---
Closing bugs fixed in 1.9.24.

[Bug 41705] Build fails in dpnet: redefinition of typedef 'SOCKADDR'

https://bugs.winehq.org/show_bug.cgi?id=41705

Michael Stefaniuc  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
   Target Milestone|---                         |1.8.x

[Bug 41705] Build fails in dpnet: redefinition of typedef 'SOCKADDR'

https://bugs.winehq.org/show_bug.cgi?id=41705

Michael Stefaniuc  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
   Target Milestone|1.8.x                       |---

--- Comment #18 from Michael Stefaniuc  ---
Removing 1.8.x milestone from bugs included in 1.8.6.