afs sunpro not always c99

old enough sunpro c won't be c99, and doesn't define
a macro when it is c99. since there's no way to tell, be safe.

Change-Id: Ib60ead7b702fe3ab203de83456d0f126afecc1ec
Reviewed-on: http://gerrit.openafs.org/2411
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/afs/afs_dcache.c b/src/afs/afs_dcache.c
index 2232da97bebfa317b68a631d5123e44fe9261396..246acdf08f3c67c20c5683bba56dbba24d5e1e83 100644 (file)
--- a/src/afs/afs_dcache.c
+++ b/src/afs/afs_dcache.c
@@ -100,7 +100,7 @@ afs_int32 afs_dcentries;    /*!< In-memory dcache entries */
 int dcacheDisabled = 0;
 
 struct afs_cacheOps afs_UfsCacheOps = {
-#if defined(AFS_SGI_ENV) && !defined(__c99)
+#if defined(__SUNPRO_C) || (defined(AFS_SGI_ENV) && !defined(__c99))
     osi_UFSOpen,
     osi_UFSTruncate,
     afs_osi_Read,
@@ -126,7 +126,7 @@ struct afs_cacheOps afs_UfsCacheOps = {
 };
 
 struct afs_cacheOps afs_MemCacheOps = {
-#if (defined(AFS_SGI_ENV) && !defined(__c99))
+#if defined(__SUNPRO_C) || (defined(AFS_SGI_ENV) && !defined(__c99))
     afs_MemCacheOpen,
     afs_MemCacheTruncate,
     afs_MemReadBlk,

diff --git a/src/afs/afs_fetchstore.c b/src/afs/afs_fetchstore.c
index f32029d552c618479a204f2fab2c460e15e0fa8e..15206fa32d11575eff5c5105009a964ee51c84ed 100644 (file)
--- a/src/afs/afs_fetchstore.c
+++ b/src/afs/afs_fetchstore.c
@@ -314,7 +314,7 @@ afs_GenericStoreProc(struct storeOps *ops, void *rock,
 
 static
 struct storeOps rxfs_storeUfsOps = {
-#if (defined(AFS_SGI_ENV) && !defined(__c99))
+#if defined(__SUNPRO_C) || (defined(AFS_SGI_ENV) && !defined(__c99))
     rxfs_storeUfsPrepare,
     rxfs_storeUfsRead,
     rxfs_storeUfsWrite,
@@ -341,7 +341,7 @@ struct storeOps rxfs_storeUfsOps = {
 
 static
 struct storeOps rxfs_storeMemOps = {
-#if (defined(AFS_SGI_ENV) && !defined(__c99))
+#if defined(__SUNPRO_C) || (defined(AFS_SGI_ENV) && !defined(__c99))
     rxfs_storeMemPrepare,
     rxfs_storeMemRead,
     rxfs_storeMemWrite,