cpp/openttd-patchpack/source Changeset - r23407:8313083e9002

Changeset - r23407:8313083e9002

Parent rev.

Child rev.

[Not reviewed]

master

! ! !

Patric Stout - 5 years ago 2019-03-04 18:46:11
truebrain@openttd.org

Remove: BeOS support (deprecated by Haiku)

In 10 years there is no commit to change how BeOS works, and we
have no active maintainer for it. It is unlikely it works in its
current state (but not impossible).

With the arrival of SDL2 (and removal of SDL), BeOS is no longer
support. SDL2 suggests to use Haiku instead of BeOS.

74 files changed with 31 insertions and 144 deletions:

README.md

config.lib

configure

projects/generate

source.list

src/intro_gui.cpp

src/lang/afrikaans.txt

src/lang/arabic_egypt.txt

src/lang/basque.txt

src/lang/belarusian.txt

src/lang/brazilian_portuguese.txt

src/lang/bulgarian.txt

src/lang/catalan.txt

src/lang/croatian.txt

src/lang/czech.txt

src/lang/danish.txt

src/lang/dutch.txt

src/lang/english.txt

src/lang/english_AU.txt

src/lang/english_US.txt

src/lang/esperanto.txt

src/lang/estonian.txt

src/lang/faroese.txt

src/lang/finnish.txt

src/lang/french.txt

src/lang/gaelic.txt

src/lang/galician.txt

src/lang/german.txt

src/lang/greek.txt

src/lang/hebrew.txt

src/lang/hungarian.txt

src/lang/icelandic.txt

src/lang/indonesian.txt

src/lang/irish.txt

src/lang/italian.txt

src/lang/japanese.txt

src/lang/korean.txt

src/lang/latin.txt

src/lang/latvian.txt

src/lang/lithuanian.txt

src/lang/luxembourgish.txt

src/lang/malay.txt

src/lang/norwegian_bokmal.txt

src/lang/norwegian_nynorsk.txt

src/lang/polish.txt

src/lang/portuguese.txt

src/lang/romanian.txt

src/lang/russian.txt

src/lang/serbian.txt

src/lang/simplified_chinese.txt

src/lang/slovak.txt

src/lang/slovenian.txt

src/lang/spanish.txt

src/lang/spanish_MX.txt

src/lang/swedish.txt

src/lang/tamil.txt

src/lang/thai.txt

src/lang/traditional_chinese.txt

src/lang/turkish.txt

src/lang/ukrainian.txt

src/lang/unfinished/chuvash.txt

src/lang/unfinished/frisian.txt

src/lang/unfinished/macedonian.txt

src/lang/unfinished/persian.txt

src/lang/unfinished/urdu.txt

src/lang/vietnamese.txt

src/lang/welsh.txt

src/network/core/host.cpp

src/network/core/os_abstraction.h

src/network/core/udp.cpp

src/os/unix/unix.cpp

src/stdafx.h

src/video/dedicated_v.cpp

src/video/sdl_v.cpp

0 comments (0 inline, 0 general)

README.md

➞

Show inline comments

@@ @@ -152,7 +152,6 @@ OpenTTD has been ported to several platf @@
 not be very difficult to port it to a new platform. The currently working
 platforms are:
 - BeOS (SDL or Allegro)
 - DOS (Allegro)
 - FreeBSD (SDL)
 - Linux (SDL or Allegro)
@@ @@ -546,10 +545,6 @@ However, for the first build one has to @@
 To make a universal binary type '`./configure --enabled-universal`'
 instead of '`./configure`'.
 ### BeOS:
 Use '`make`', but do a '`./configure`' before the first build.
 ### OS/2:
 A comprehensive GNU build environment is required to build the OS/2 version.

config.lib

➞

Show inline comments

@@ @@ -559,10 +559,10 @@ check_params() { @@
 	# Check if all params have valid values
 	# OS only allows DETECT, UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, BEOS, HAIKU, SUNOS, CYGWIN, MINGW, OS2, and DOS
 	if [ -z "`echo $os | egrep '^(DETECT|UNIX|OSX|FREEBSD|DRAGONFLY|OPENBSD|NETBSD|HPUX|BEOS|HAIKU|SUNOS|CYGWIN|MINGW|OS2|DOS)$'`" ]; then
 	# OS only allows DETECT, UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, HAIKU, SUNOS, CYGWIN, MINGW, OS2, and DOS
 	if [ -z "`echo $os | egrep '^(DETECT|UNIX|OSX|FREEBSD|DRAGONFLY|OPENBSD|NETBSD|HPUX|HAIKU|SUNOS|CYGWIN|MINGW|OS2|DOS)$'`" ]; then
 		log 1 "configure: error: invalid option --os=$os"
-		log 1 " Available options are: --os=[DETECT|UNIX|OSX|FREEBSD|DRAGONFLY|OPENBSD|NETBSD|HPUX|BEOS|HAIKU|SUNOS|CYGWIN|MINGW|OS2|DOS]"
 		log 1 " Available options are: --os=[DETECT|UNIX|OSX|FREEBSD|DRAGONFLY|OPENBSD|NETBSD|HPUX|HAIKU|SUNOS|CYGWIN|MINGW|OS2|DOS]"
 		exit 1
 	fi
 	# cpu_type can be either 32 or 64
@@ @@ -1641,12 +1641,12 @@ make_cflags_and_ldflags() { @@
 		fi
 	fi
-	if [ "$os" = "BEOS" ] || [ "$os" = "HAIKU" ]; then
 	if [ "$os" = "HAIKU" ]; then
 		LIBS="$LIBS -lmidi -lbe"
 	fi
 	# Most targets act like UNIX, just with some additions
-	if [ "$os" = "BEOS" ] || [ "$os" = "HAIKU" ] || [ "$os" = "OSX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "DRAGONFLY" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OS2" ]; then
 	if [ "$os" = "HAIKU" ] || [ "$os" = "OSX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "DRAGONFLY" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OS2" ]; then
 		CFLAGS="$CFLAGS -DUNIX"
 	fi
 	# And others like Windows
@@ @@ -1861,10 +1861,6 @@ make_cflags_and_ldflags() { @@
 	if [ "$enable_network" != "0" ]; then
 		CFLAGS="$CFLAGS -DENABLE_NETWORK"
 		if [ "$os" = "BEOS" ]; then
 			LDFLAGS="$LDFLAGS -lbind -lsocket"
 		fi
 		if [ "$os" = "HAIKU" ]; then
 			LDFLAGS="$LDFLAGS -lnetwork"
 		fi
@@ @@ -2350,7 +2346,7 @@ detect_awk() { @@
 detect_os() {
 	if [ "$os" = "DETECT" ]; then
-		# Detect UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, HPUX, BEOS, SUNOS, CYGWIN, MINGW, OS2, and DOS
 		# Detect UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, HPUX, SUNOS, CYGWIN, MINGW, OS2, and DOS
 		# Try first via dumpmachine, then via uname
 		os=`echo "$host" | tr '[A-Z]' '[a-z]' | $awk '
@@ @@ -2361,7 +2357,6 @@ detect_os() { @@
 					/openbsd/      { print "OPENBSD";   exit}
 					/netbsd/       { print "NETBSD";    exit}
 					/hp-ux/        { print "HPUX";      exit}
 					/beos/         { print "BEOS";      exit}
 					/haiku/        { print "HAIKU";     exit}
 					/sunos/        { print "SUNOS";     exit}
 					/solaris/      { print "SUNOS";     exit}
@@ @@ -2380,7 +2375,6 @@ detect_os() { @@
 					/openbsd/      { print "OPENBSD";   exit}
 					/netbsd/       { print "NETBSD";    exit}
 					/hp-ux/        { print "HPUX";      exit}
 					/beos/         { print "BEOS";      exit}
 					/haiku/        { print "HAIKU";     exit}
 					/sunos/        { print "SUNOS";     exit}
 					/cygwin/       { print "CYGWIN";    exit}
@@ @@ -2393,7 +2387,7 @@ detect_os() { @@
 		if [ -z "$os" ]; then
 			log 1 "detecting OS... none detected"
 			log 1 "I couldn't detect your OS. Please use --os=OS to force one"
-			log 1 "Allowed values are: UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, HPUX, BEOS, HAIKU, SUNOS, CYGWIN, MINGW, OS2, and DOS"
 			log 1 "Allowed values are: UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, HPUX, HAIKU, SUNOS, CYGWIN, MINGW, OS2, and DOS"
 			exit 1
 		fi
@@ @@ -3480,7 +3474,7 @@ showhelp() { @@
 	echo "  --lipo=LIPO                    the lipo to use (OSX ONLY) [HOST-lipo]"
 	echo "  --os=OS                        the OS we are compiling for [DETECT]"
 	echo "                                 DETECT/UNIX/OSX/FREEBSD/DRAGONFLY/OPENBSD/"
-	echo "                                 NETBSD/HPUX/BEOS/SUNOS/CYGWIN/"
 	echo "                                 NETBSD/HPUX/SUNOS/CYGWIN/"
 	echo "                                 MINGW/OS2/DOS/HAIKU"
 	echo ""
 	echo "Paths:"

configure

➞

Show inline comments

@@ @@ -117,8 +117,7 @@ AWKCOMMAND=' @@
 		if ($0 == "AI"          && "'$enable_ai'" == "0")          { next; }
 		if ($0 == "COCOA"       && "'$with_cocoa'" == "0")         { next; }
 		if ($0 == "DOS"         && "'$os'" != "DOS")               { next; }
 		if ($0 == "BEOS"        && "'$os'" != "BEOS" &&
 		                                       "'$os'" != "HAIKU") { next; }
 		if ($0 == "HAIKU"       && "'$os'" != "HAIKU")             { next; }
 		if ($0 == "WIN32"       && "'$os'" != "MINGW" &&
 		                 "'$os'" != "CYGWIN" && "'$os'" != "MSVC") { next; }
 		if ($0 == "MSVC"        && "'$os'" != "MSVC")              { next; }

projects/generate

➞

Show inline comments

@@ @@ -132,7 +132,7 @@ load_main_data() { @@
 			if ($0 == "DEDICATED"   && "'$enable_dedicated'" != "1")   { next; }
 			if ($0 == "AI"          && "'$enable_ai'" == "0")          { next; }
 			if ($0 == "COCOA"       && "'$with_cocoa'" == "0")         { next; }
-			if ($0 == "BEOS"        && "'$os'" != "BEOS")              { next; }
+			if ($0 == "HAIKU"       && "'$os'" != "HAIKU")             { next; }
 			if ($0 == "WIN32"       && "'$os'" != "MINGW" &&
 											"'$os'" != "CYGWIN" && "'$os'" != "MSVC" ) { next; }
 			if ($0 == "MSVC"        && "'$os'" != "MSVC")              { next; }

source.list

➞

Show inline comments

@@ @@ -1117,7 +1117,7 @@ music/midifile.cpp @@
 		music/extmidi.cpp
 	#end
 #end
-#if BEOS
+#if HAIKU
 	music/bemidi.cpp
 #end
 #if LIBTIMIDITY

src/intro_gui.cpp

➞

Show inline comments

@@ @@ -293,8 +293,6 @@ void AskExitGame() @@
 		SetDParam(0, STR_OSNAME_WINDOWS);
 #elif defined(__APPLE__)
 		SetDParam(0, STR_OSNAME_OSX);
 #elif defined(__BEOS__)
 		SetDParam(0, STR_OSNAME_BEOS);
 #elif defined(__HAIKU__)
 		SetDParam(0, STR_OSNAME_HAIKU);
 #elif defined(__OS2__)

src/lang/afrikaans.txt

➞

Show inline comments

@@ @@ -1771,7 +1771,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/arabic_egypt.txt

➞

Show inline comments

@@ @@ -1443,7 +1443,6 @@ STR_OSNAME_WINDOWS :ويندوز @@
 STR_OSNAME_DOS                                                  :دوس
 STR_OSNAME_UNIX                                                 :يونكس
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :بي او اس
 STR_OSNAME_HAIKU                                                :هايكو
 STR_OSNAME_OS2                                                  :او اس/2
 STR_OSNAME_SUNOS                                                :صن

src/lang/basque.txt

➞

Show inline comments

@@ @@ -1683,7 +1683,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/belarusian.txt

➞

Show inline comments

@@ @@ -2096,7 +2096,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/brazilian_portuguese.txt

➞

Show inline comments

@@ @@ -1787,7 +1787,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/bulgarian.txt

➞

Show inline comments

@@ @@ -1719,7 +1719,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :ДОС
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/catalan.txt

➞

Show inline comments

@@ @@ -1798,7 +1798,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/croatian.txt

➞

Show inline comments

@@ @@ -1893,7 +1893,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/czech.txt

➞

Show inline comments

@@ @@ -1865,7 +1865,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unixu
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/danish.txt

➞

Show inline comments

@@ @@ -1797,7 +1797,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/dutch.txt

➞

Show inline comments

@@ @@ -1797,7 +1797,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/english.txt

➞

Show inline comments

@@ @@ -1801,7 +1801,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/english_AU.txt

➞

Show inline comments

@@ @@ -1747,7 +1747,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/english_US.txt

➞

Show inline comments

@@ @@ -1801,7 +1801,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/esperanto.txt

➞

Show inline comments

@@ @@ -1430,7 +1430,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unikso
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/estonian.txt

➞

Show inline comments

@@ @@ -1831,7 +1831,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/faroese.txt

➞

Show inline comments

@@ @@ -1594,7 +1594,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/finnish.txt

➞

Show inline comments

@@ @@ -1801,7 +1801,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/french.txt

➞

Show inline comments

@@ @@ -1798,7 +1798,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/gaelic.txt

➞

Show inline comments

@@ @@ -1981,7 +1981,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/galician.txt

➞

Show inline comments

@@ @@ -1774,7 +1774,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/german.txt

➞

Show inline comments

@@ @@ -1792,7 +1792,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/greek.txt

➞

Show inline comments

@@ @@ -1894,7 +1894,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/hebrew.txt

➞

Show inline comments

@@ @@ -1796,7 +1796,6 @@ STR_OSNAME_WINDOWS :חלונות @@
 STR_OSNAME_DOS                                                  :דוס
 STR_OSNAME_UNIX                                                 :יוניקס
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :מערכת הפעלה בי
 STR_OSNAME_HAIKU                                                :הייקו
 STR_OSNAME_OS2                                                  :מערכת הפעלה או.אס שתיים
 STR_OSNAME_SUNOS                                                :סולריס

src/lang/hungarian.txt

➞

Show inline comments

@@ @@ -1861,7 +1861,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/icelandic.txt

➞

Show inline comments

@@ @@ -1635,7 +1635,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/indonesian.txt

➞

Show inline comments

@@ @@ -1780,7 +1780,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/irish.txt

➞

Show inline comments

@@ @@ -1770,7 +1770,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/italian.txt

➞

Show inline comments

@@ @@ -1821,7 +1821,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/japanese.txt

➞

Show inline comments

@@ @@ -1770,7 +1770,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/korean.txt

➞

Show inline comments

@@ @@ -1798,7 +1798,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :{G=f}DOS
 STR_OSNAME_UNIX                                                 :{G=f}Unix
 STR_OSNAME_OSX                                                  :{G=f}OS{NBSP}X
 STR_OSNAME_BEOS                                                 :{G=f}BeOS
 STR_OSNAME_HAIKU                                                :{G=f}Haiku
 STR_OSNAME_OS2                                                  :{G=f}OS/2
 STR_OSNAME_SUNOS                                                :{G=f}SunOS

src/lang/latin.txt

➞

Show inline comments

@@ @@ -1971,7 +1971,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/latvian.txt

➞

Show inline comments

@@ @@ -1717,7 +1717,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/lithuanian.txt

➞

Show inline comments

@@ @@ -1989,7 +1989,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/luxembourgish.txt

➞

Show inline comments

@@ @@ -1773,7 +1773,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/malay.txt

➞

Show inline comments

@@ @@ -1531,7 +1531,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/norwegian_bokmal.txt

➞

Show inline comments

@@ @@ -1800,7 +1800,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/norwegian_nynorsk.txt

➞

Show inline comments

@@ @@ -1693,7 +1693,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/polish.txt

➞

Show inline comments

@@ @@ -2169,7 +2169,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/portuguese.txt

➞

Show inline comments

@@ @@ -1798,7 +1798,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/romanian.txt

➞

Show inline comments

@@ @@ -1747,7 +1747,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/russian.txt

➞

Show inline comments

@@ @@ -1949,7 +1949,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/serbian.txt

➞

Show inline comments

@@ @@ -1977,7 +1977,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/simplified_chinese.txt

➞

Show inline comments

@@ @@ -1780,7 +1780,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/slovak.txt

➞

Show inline comments

@@ @@ -1838,7 +1838,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/slovenian.txt

➞

Show inline comments

@@ @@ -1924,7 +1924,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/spanish.txt

➞

Show inline comments

@@ @@ -1783,7 +1783,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/spanish_MX.txt

➞

Show inline comments

@@ @@ -1798,7 +1798,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/swedish.txt

➞

Show inline comments

@@ @@ -1791,7 +1791,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/tamil.txt

➞

Show inline comments

@@ @@ -1540,7 +1540,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/thai.txt

➞

Show inline comments

@@ @@ -1721,7 +1721,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :ระบบปฏิบัติการ Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/traditional_chinese.txt

➞

Show inline comments

@@ @@ -1770,7 +1770,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/turkish.txt

➞

Show inline comments

@@ @@ -1796,7 +1796,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/ukrainian.txt

➞

Show inline comments

@@ @@ -1899,7 +1899,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/unfinished/chuvash.txt

➞

Show inline comments

@@ @@ -665,7 +665,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/unfinished/frisian.txt

➞

Show inline comments

@@ @@ -1704,7 +1704,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/unfinished/macedonian.txt

➞

Show inline comments

@@ @@ -952,7 +952,6 @@ STR_QUIT_NO :{BLACK}Не @@
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/unfinished/persian.txt

➞

Show inline comments

@@ @@ -1487,7 +1487,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :هایکو
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/unfinished/urdu.txt

➞

Show inline comments

@@ @@ -1384,7 +1384,6 @@ STR_OSNAME_WINDOWS :ونڈوز @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :یونیکس
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/vietnamese.txt

➞

Show inline comments

@@ @@ -1786,7 +1786,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/lang/welsh.txt

➞

Show inline comments

@@ @@ -1773,7 +1773,6 @@ STR_OSNAME_WINDOWS @@
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_OS2                                                  :OS/2
 STR_OSNAME_SUNOS                                                :SunOS

src/network/core/host.cpp

➞

Show inline comments

@@ @@ -24,7 +24,7 @@ @@
  */
 static void NetworkFindBroadcastIPsInternal(NetworkAddressList *broadcast);
-#if defined(BEOS_NET_SERVER) || defined(__HAIKU__) /* doesn't have neither getifaddrs or net/if.h */
 #if defined(__HAIKU__) /* doesn't have neither getifaddrs or net/if.h */
 /* Based on Andrew Bachmann's netstat+.c. Big thanks to him! */
 extern "C" int _netstat(int fd, char **output, int verbose);

src/network/core/os_abstraction.h

➞

Show inline comments

 #	define SOCKET int
 #	define INVALID_SOCKET -1
 #	define ioctlsocket ioctl
 #	if !defined(BEOS_NET_SERVER)
 #		define closesocket close
 #	endif
 #	define closesocket close
 #	define GET_LAST_ERROR() (errno)
 /* Need this for FIONREAD on solaris */
 #	define BSD_COMP
 /* Includes needed for UNIX-like systems */
 #	include <unistd.h>
 #	include <sys/ioctl.h>
 #	if defined(__BEOS__) && defined(BEOS_NET_SERVER)
 #		include <be/net/socket.h>
 #		include <be/kernel/OS.h> /* snooze() */
 #		include <be/net/netdb.h>
 		typedef unsigned long in_addr_t;
 #		define INADDR_NONE INADDR_BROADCAST
 #	else
 #		include <sys/socket.h>
 #		include <netinet/in.h>
 #		include <netinet/tcp.h>
 #		include <arpa/inet.h>
 #		include <net/if.h>
 #	include <sys/socket.h>
 #	include <netinet/in.h>
 #	include <netinet/tcp.h>
 #	include <arpa/inet.h>
 #	include <net/if.h>
 /* According to glibc/NEWS, <ifaddrs.h> appeared in glibc-2.3. */
 #		if !defined(__sgi__) && !defined(SUNOS) && !defined(__BEOS__) && !defined(__HAIKU__) && !defined(__INNOTEK_LIBC__) \
 		   && !(defined(__GLIBC__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 2)) && !defined(__dietlibc__) && !defined(HPUX)
 #	if !defined(__sgi__) && !defined(SUNOS) && !defined(__HAIKU__) && !defined(__INNOTEK_LIBC__) \
 	   && !(defined(__GLIBC__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 2)) && !defined(__dietlibc__) && !defined(HPUX)
 /* If for any reason ifaddrs.h does not exist on your system, comment out
  *   the following two lines and an alternative way will be used to fetch
  *   the list of IPs from the system. */
 #			include <ifaddrs.h>
 #			define HAVE_GETIFADDRS
 #		endif
 #		if !defined(INADDR_NONE)
 #			define INADDR_NONE 0xffffffff
 #		endif
 #		if defined(__BEOS__) && !defined(BEOS_NET_SERVER)
 			/* needed on Zeta */
 #			include <sys/sockio.h>
 #		endif
 #	endif /* BEOS_NET_SERVER */
 #		include <ifaddrs.h>
 #		define HAVE_GETIFADDRS
 #	endif
 #	if !defined(INADDR_NONE)
 #		define INADDR_NONE 0xffffffff
 #	endif
-#	if !defined(__BEOS__) && defined(__GLIBC__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1)
 #	if defined(__GLIBC__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1)
 		typedef uint32_t in_addr_t;
 #	endif
 #	include <netdb.h>
 #endif /* UNIX */
 #ifdef __BEOS__
 	typedef int socklen_t;
 #endif
 #ifdef __HAIKU__
 	#define IPV6_V6ONLY 27
 #endif
 #else
 	int nonblocking = 1;
 #endif
 #if (defined(__BEOS__) && defined(BEOS_NET_SERVER))
 	return setsockopt(d, SOL_SOCKET, SO_NONBLOCK, &nonblocking, sizeof(nonblocking)) == 0;
 #else
 	return ioctlsocket(d, FIONBIO, &nonblocking) == 0;
 #endif
+}
 /**
 static inline bool SetNoDelay(SOCKET d)
+{
 	/* XXX should this be done at all? */
 #if !defined(BEOS_NET_SERVER) /* not implemented on BeOS net_server */
 	int b = 1;
 	/* The (const char*) cast is needed for windows */
 	return setsockopt(d, IPPROTO_TCP, TCP_NODELAY, (const char*)&b, sizeof(b)) == 0;
 #else
 	return true;
 #endif
+}
 /* Make sure these structures have the size we expect them to be */

src/network/core/udp.cpp

➞

Show inline comments

@@ @@ -94,7 +94,6 @@ void NetworkUDPSocketHandler::SendPacket @@
 		p->PrepareToSend();
 #ifndef BEOS_NET_SERVER /* will work around this, some day; maybe. */
 		if (broadcast) {
 			/* Enable broadcast */
 			unsigned long val = 1;
@@ @@ -102,7 +101,6 @@ void NetworkUDPSocketHandler::SendPacket @@
 				DEBUG(net, 1, "[udp] setting broadcast failed with: %i", GET_LAST_ERROR());
+			}
+		}
 #endif
 		/* Send the buffer */
 		int res = sendto(s->second, (const char*)p->buffer, p->size, 0, (const struct sockaddr *)send.GetAddress(), send.GetAddressLength());

src/os/unix/unix.cpp

➞

Show inline comments

@@ @@ -270,11 +270,7 @@ bool GetClipboardContents(char *buffer, @@
 void CSleep(int milliseconds)
+{
 	#if defined(__BEOS__)
 		snooze(milliseconds * 1000);
 	#else
 		usleep(milliseconds * 1000);
 	#endif
 	usleep(milliseconds * 1000);
+}

src/stdafx.h

➞

Show inline comments

@@ @@ -16,7 +16,7 @@ @@
 	#include "os/macosx/osx_stdafx.h"
 #endif /* __APPLE__ */
-#if defined(__BEOS__) || defined(__HAIKU__)
 #if defined(__HAIKU__)
 	#include <SupportDefs.h>
 	#include <unistd.h>
 	#define _GNU_SOURCE
@@ @@ -304,12 +304,12 @@ @@
 typedef unsigned char byte;
 /* This is already defined in unix, but not in QNX Neutrino (6.x)*/
-#if (!defined(UNIX) && !defined(__CYGWIN__) && !defined(__BEOS__) && !defined(__HAIKU__)) || defined(__QNXNTO__)
 #if (!defined(UNIX) && !defined(__CYGWIN__) && !defined(__HAIKU__)) || defined(__QNXNTO__)
 	typedef unsigned int uint;
 #endif
 #if defined(TROUBLED_INTS)
-	/* NDS'/BeOS'/Haiku's types for uint32/int32 are based on longs, which causes
 	/* Haiku's types for uint32/int32 are based on longs, which causes
 	 * trouble all over the place in OpenTTD. */
 	#define uint32 uint32_ugly_hack
 	#define int32 int32_ugly_hack

src/video/dedicated_v.cpp

➞

Show inline comments

@@ @@ -26,10 +26,6 @@ @@
 #include "../saveload/saveload.h"
 #include "dedicated_v.h"
 #ifdef BEOS_NET_SERVER
 #include <net/socket.h>
 #endif
 #ifdef __OS2__
 #	include <sys/time.h> /* gettimeofday */
 #	include <sys/types.h>

src/video/sdl_v.cpp

➞

Show inline comments

@@ @@ -496,8 +496,6 @@ static uint ConvertSdlKeyIntoMy(SDL_keys @@
 	if (sym->scancode == 41) key = WKC_BACKQUOTE;
 #elif defined(__APPLE__)
 	if (sym->scancode == 10) key = WKC_BACKQUOTE;
 #elif defined(__BEOS__)
 	if (sym->scancode == 17) key = WKC_BACKQUOTE;
 #elif defined(__SVR4) && defined(__sun)
 	if (sym->scancode == 60) key = WKC_BACKQUOTE;
 	if (sym->scancode == 49) key = WKC_BACKSPACE;

0 comments (0 inline, 0 general)