From d7ff96bc5070b259ecbdc10c719702a52acc8917 Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Mon, 2 Apr 2012 16:16:37 -0500 Subject: [PATCH] SOLARIS: Correct misplaced osi_machdep.h #endif Commit 64778fd7bece52360482f9a51f19b34dac1d2678 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 Tested-by: BuildBot (cherry picked from commit a66268f69a2da0dc21957338eebe5c91b279ddda) Change-Id: I2d4fd2b447c3d5ba142bc2127d1e27d3d0b9ffdb Reviewed-on: http://gerrit.openafs.org/7045 Tested-by: BuildBot Reviewed-by: Alistair Ferguson Reviewed-by: Derrick Brashear Reviewed-on: http://gerrit.openafs.org/7046 Tested-by: Derrick Brashear --- src/afs/SOLARIS/osi_machdep.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/afs/SOLARIS/osi_machdep.h b/src/afs/SOLARIS/osi_machdep.h index 3e8c886816..964ac8b3ac 100644 --- a/src/afs/SOLARIS/osi_machdep.h +++ b/src/afs/SOLARIS/osi_machdep.h @@ -99,7 +99,6 @@ extern kmutex_t afs_global_lock; #define ISAFS_GLOCK() mutex_owned(&afs_global_lock) #define osi_InitGlock() \ mutex_init(&afs_global_lock, "afs_global_lock", MUTEX_DEFAULT, NULL); -#endif /* Associate the Berkley signal equivalent lock types to System V's */ @@ -144,6 +143,7 @@ struct afs_ifinfo { int metric; ipaddr_t dstaddr; }; +#endif /* AFS_SUN510_ENV */ #define osi_procname(procname, size) strncpy(procname, PTOU(ttoproc(curthread))->u_comm, size)