diff options
Diffstat (limited to 'sal/qa')
| -rw-r--r-- | sal/qa/buildall.pl | 11 | ||||
| -rw-r--r-- | sal/qa/osl/socket/osl_AcceptorSocket.cxx | 4 | ||||
| -rw-r--r-- | sal/qa/osl/socket/osl_ConnectorSocket.cxx | 4 | ||||
| -rw-r--r-- | sal/qa/osl/socket/osl_DatagramSocket.cxx | 4 | ||||
| -rw-r--r-- | sal/qa/osl/socket/osl_Socket.cxx | 4 | ||||
| -rw-r--r-- | sal/qa/osl/socket/osl_Socket2.cxx | 4 | ||||
| -rw-r--r-- | sal/qa/osl/socket/osl_SocketAddr.cxx | 4 | ||||
| -rw-r--r-- | sal/qa/osl/socket/osl_StreamSocket.cxx | 4 |
8 files changed, 17 insertions, 22 deletions
diff --git a/sal/qa/buildall.pl b/sal/qa/buildall.pl index 4b70a4884559..67265710b11a 100644 --- a/sal/qa/buildall.pl +++ b/sal/qa/buildall.pl @@ -126,22 +126,17 @@ sub checkForKillobj() # ------------------------------------------------------------------------------ sub initEnvironment() { - my $gui = $ENV{GUI}; + my $os = $ENV{OS}; # no error output in forms of message boxes $ENV{'DISABLE_SAL_DBGBOX'}="t"; SWITCH: { - if ( $gui eq "WNT" ) { + if ( $os eq "WNT" ) { $FS = "\\"; $g_sTempDir = $ENV{TMP} ? "$ENV{TMP}${FS}" : "c:${FS}tmp${FS}"; last SWITCH; } - if ( $gui eq "WIN" ) { - $FS = "\\"; - $g_sTempDir = $ENV{TMP} ? "$ENV{TMP}${FS}" : "c:${FS}tmp${FS}"; - last SWITCH; - } - if ( $gui eq "UNX" ) { + else { $FS = "/"; $g_sTempDir = $ENV{TMP} ? "$ENV{TMP}${FS}" : "${FS}tmp${FS}"; last SWITCH; diff --git a/sal/qa/osl/socket/osl_AcceptorSocket.cxx b/sal/qa/osl/socket/osl_AcceptorSocket.cxx index 7af519fc49d7..30390fd72ac8 100644 --- a/sal/qa/osl/socket/osl_AcceptorSocket.cxx +++ b/sal/qa/osl/socket/osl_AcceptorSocket.cxx @@ -21,13 +21,13 @@ 1. the BSD socket function will meet "unresolved external symbol error" on Windows platform if you are not including ws2_32.lib in makefile.mk, the including format will be like this: - .IF "$(GUI)" == "WNT" + .IF "$(OS)" == "WNT" SHL1STDLIBS += $(SOLARLIBDIR)$/cppunit.lib SHL1STDLIBS += ws2_32.lib .ENDIF likewise on Solaris platform. - .IF "$(GUI)" == "UNX" + .IF "$(OS)" != "WNT" SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a SHL1STDLIBS += -lsocket -ldl -lnsl .ENDIF diff --git a/sal/qa/osl/socket/osl_ConnectorSocket.cxx b/sal/qa/osl/socket/osl_ConnectorSocket.cxx index b2bbd095ed1f..271bcc83a61e 100644 --- a/sal/qa/osl/socket/osl_ConnectorSocket.cxx +++ b/sal/qa/osl/socket/osl_ConnectorSocket.cxx @@ -21,13 +21,13 @@ 1. the BSD socket function will meet "unresolved external symbol error" on Windows platform if you are not including ws2_32.lib in makefile.mk, the including format will be like this: - .IF "$(GUI)" == "WNT" + .IF "$(OS)" == "WNT" SHL1STDLIBS += $(SOLARLIBDIR)$/cppunit.lib SHL1STDLIBS += ws2_32.lib .ENDIF likewise on Solaris platform. - .IF "$(GUI)" == "UNX" + .IF "$(OS)" != "WNT" SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a SHL1STDLIBS += -lsocket -ldl -lnsl .ENDIF diff --git a/sal/qa/osl/socket/osl_DatagramSocket.cxx b/sal/qa/osl/socket/osl_DatagramSocket.cxx index 3e502cf11d67..9bfe6234b596 100644 --- a/sal/qa/osl/socket/osl_DatagramSocket.cxx +++ b/sal/qa/osl/socket/osl_DatagramSocket.cxx @@ -21,13 +21,13 @@ 1. the BSD socket function will meet "unresolved external symbol error" on Windows platform if you are not including ws2_32.lib in makefile.mk, the including format will be like this: - .IF "$(GUI)" == "WNT" + .IF "$(OS)" == "WNT" SHL1STDLIBS += $(SOLARLIBDIR)$/cppunit.lib SHL1STDLIBS += ws2_32.lib .ENDIF likewise on Solaris platform. - .IF "$(GUI)" == "UNX" + .IF "$(OS)" != "WNT" SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a SHL1STDLIBS += -lsocket -ldl -lnsl .ENDIF diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx index e44ecb86c519..5da5af638914 100644 --- a/sal/qa/osl/socket/osl_Socket.cxx +++ b/sal/qa/osl/socket/osl_Socket.cxx @@ -21,13 +21,13 @@ 1. the BSD socket function will meet "unresolved external symbol error" on Windows platform if you are not including ws2_32.lib in makefile.mk, the including format will be like this: - .IF "$(GUI)" == "WNT" + .IF "$(OS)" == "WNT" SHL1STDLIBS += $(SOLARLIBDIR)$/cppunit.lib SHL1STDLIBS += ws2_32.lib .ENDIF likewise on Solaris platform. - .IF "$(GUI)" == "UNX" + .IF "$(OS)" != "WNT" SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a SHL1STDLIBS += -lsocket -ldl -lnsl .ENDIF diff --git a/sal/qa/osl/socket/osl_Socket2.cxx b/sal/qa/osl/socket/osl_Socket2.cxx index 07f0a4bbd48d..86fdf91ec7ea 100644 --- a/sal/qa/osl/socket/osl_Socket2.cxx +++ b/sal/qa/osl/socket/osl_Socket2.cxx @@ -21,13 +21,13 @@ 1. the BSD socket function will meet "unresolved external symbol error" on Windows platform if you are not including ws2_32.lib in makefile.mk, the including format will be like this: - .IF "$(GUI)" == "WNT" + .IF "$(OS)" == "WNT" SHL1STDLIBS += $(SOLARLIBDIR)$/cppunit.lib SHL1STDLIBS += ws2_32.lib .ENDIF likewise on Solaris platform. - .IF "$(GUI)" == "UNX" + .IF "$(OS)" != "WNT" SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a SHL1STDLIBS += -lsocket -ldl -lnsl .ENDIF diff --git a/sal/qa/osl/socket/osl_SocketAddr.cxx b/sal/qa/osl/socket/osl_SocketAddr.cxx index d82942417dc8..1e8529a40cd7 100644 --- a/sal/qa/osl/socket/osl_SocketAddr.cxx +++ b/sal/qa/osl/socket/osl_SocketAddr.cxx @@ -21,13 +21,13 @@ 1. the BSD socket function will meet "unresolved external symbol error" on Windows platform if you are not including ws2_32.lib in makefile.mk, the including format will be like this: - .IF "$(GUI)" == "WNT" + .IF "$(OS)" == "WNT" SHL1STDLIBS += $(SOLARLIBDIR)$/cppunit.lib SHL1STDLIBS += ws2_32.lib .ENDIF likewise on Solaris platform. - .IF "$(GUI)" == "UNX" + .IF "$(OS)" != "WNT" SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a SHL1STDLIBS += -lsocket -ldl -lnsl .ENDIF diff --git a/sal/qa/osl/socket/osl_StreamSocket.cxx b/sal/qa/osl/socket/osl_StreamSocket.cxx index c02148f6783a..22971a2a751a 100644 --- a/sal/qa/osl/socket/osl_StreamSocket.cxx +++ b/sal/qa/osl/socket/osl_StreamSocket.cxx @@ -21,13 +21,13 @@ 1. the BSD socket function will meet "unresolved external symbol error" on Windows platform if you are not including ws2_32.lib in makefile.mk, the including format will be like this: - .IF "$(GUI)" == "WNT" + .IF "$(OS)" == "WNT" SHL1STDLIBS += $(SOLARLIBDIR)$/cppunit.lib SHL1STDLIBS += ws2_32.lib .ENDIF likewise on Solaris platform. - .IF "$(GUI)" == "UNX" + .IF "$(OS)" != "WNT" SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a SHL1STDLIBS += -lsocket -ldl -lnsl .ENDIF |