Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove OSF/1 support #942

Closed
wants to merge 1 commit into from
Closed

Remove OSF/1 support #942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions compat/osdetect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@
#elif defined(__hpux) /* HP-UX - SysV-like? */
#define _SQUID_HPUX_ 1

#elif defined(__osf__) /* OSF/1 */
#define _SQUID_OSF_ 1

#elif defined(_AIX) /* AIX */
#define _SQUID_AIX_ 1

Expand Down
2 changes: 1 addition & 1 deletion compat/shm.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
bool
shm_portable_segment_name_is_path()
{
#if _SQUID_HPUX_ || _SQUID_OSF_ || defined(__vms) || (_SQUID_FREEBSD_ && (__FreeBSD__ < 7)) || _SQUID_DRAGONFLY_
#if _SQUID_HPUX_ || defined(__vms) || (_SQUID_FREEBSD_ && (__FreeBSD__ < 7)) || _SQUID_DRAGONFLY_
return true;
#elif _SQUID_FREEBSD_
int jailed = 0;
Expand Down
3 changes: 0 additions & 3 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3627,9 +3627,6 @@ AC_MSG_NOTICE([BUILD C++ FLAGS: $CXXFLAGS])
AC_MSG_NOTICE([BUILD EXTRA C++ FLAGS: $SQUID_CXXFLAGS])
AC_MSG_NOTICE([BUILD Tools C++ FLAGS: $BUILDCXXFLAGS])

dnl Clean up after OSF/1 core dump bug
rm -f core

AC_CONFIG_FILES([
Makefile
compat/Makefile
Expand Down
1 change: 0 additions & 1 deletion scripts/icpserver.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
$IP_ADD_MEMBERSHIP=5;
$whoami =~ /SunOS [^\s]+ 5/ && ($IP_MULTICAST_TTL=19);
$whoami =~ /IRIX [^\s]+ 5/ && ($IP_MULTICAST_TTL=23);
$whoami =~ /OSF1/ && ($IP_MULTICAST_TTL=12);
# any more funnies ?

setsockopt(S, 0, $IP_ADD_MEMBERSHIP, $SERVERIP."\0\0\0\0")
Expand Down
4 changes: 0 additions & 4 deletions src/ipc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,6 @@ ipcCreate(int type, const char *prog, const char *const args[], const char *name
int x;
int xerrno;

#if USE_POLL && _SQUID_OSF_
assert(type != IPC_FIFO);
#endif

if (rfd)
*rfd = -1;

Expand Down
2 changes: 1 addition & 1 deletion src/tools.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ rusage_maxrss(struct rusage *r)
{
#if _SQUID_SGI_ && _ABIAPI
return r->ru_pad[0];
#elif _SQUID_SGI_|| _SQUID_OSF_ || _SQUID_AIX_ || defined(BSD4_4)
#elif _SQUID_SGI_|| _SQUID_AIX_ || defined(BSD4_4)

return r->ru_maxrss;
#elif defined(HAVE_GETPAGESIZE) && HAVE_GETPAGESIZE != 0
Expand Down
5 changes: 1 addition & 4 deletions src/unlinkd.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,10 +202,7 @@ unlinkdInit(void)
localhost.setLocalhost();

pid = ipcCreate(
#if USE_POLL && _SQUID_OSF_
/* pipes and poll() don't get along on DUNIX -DW */
IPC_STREAM,
#elif _SQUID_WINDOWS_
#if _SQUID_WINDOWS_
/* select() will fail on a pipe */
IPC_TCP_SOCKET,
#else
Expand Down