jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 06:50:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SOLARIS: Correct misplaced osi_machdep.h #endif

Browse Source 
Commit 64778fd7be removed some '#ifdef
KERNEL' blocks, but for one block in SOLARIS/osi_machdep.h, the wrong
trailing #endif was removed. This effectively makes the last part of
the file Solaris 10+ only, and bypasses the header guard. On systems
before Solaris 10, this causes us to lose the osi_procname definition,
which eventually shows up as an undefined symbol.

So, reinstate the original #endif, and remove the correct #endif
instead.

Reviewed-on: http://gerrit.openafs.org/7042
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
(cherry picked from commit a66268f69a)

Change-Id: I2d4fd2b447c3d5ba142bc2127d1e27d3d0b9ffdb
Reviewed-on: http://gerrit.openafs.org/7045
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Alistair Ferguson <alistair.ferguson@mac.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Reviewed-on: http://gerrit.openafs.org/7046
Tested-by: Derrick Brashear <shadow@dementix.org>
This commit is contained in:
Andrew Deason 2012-04-02 16:16:37 -05:00 committed by Derrick Brashear
parent 7de9169bff
commit d7ff96bc50
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/afs/SOLARIS/osi_machdep.h
View File

@ -99,7 +99,6 @@ extern kmutex_t afs_global_lock;
#define ISAFS_GLOCK() mutex_owned(&afs_global_lock) #define ISAFS_GLOCK() mutex_owned(&afs_global_lock)
#define osi_InitGlock() \ #define osi_InitGlock() \
mutex_init(&afs_global_lock, "afs_global_lock", MUTEX_DEFAULT, NULL); mutex_init(&afs_global_lock, "afs_global_lock", MUTEX_DEFAULT, NULL);
#endif
/* Associate the Berkley signal equivalent lock types to System V's */ /* Associate the Berkley signal equivalent lock types to System V's */
@ -144,6 +143,7 @@ struct afs_ifinfo {
int metric; int metric;
ipaddr_t dstaddr; ipaddr_t dstaddr;
}; };
#endif /* AFS_SUN510_ENV */
#define osi_procname(procname, size) strncpy(procname, PTOU(ttoproc(curthread))->u_comm, size) #define osi_procname(procname, size) strncpy(procname, PTOU(ttoproc(curthread))->u_comm, size)