summaryrefslogtreecommitdiff
path: root/indra/llcommon/llsys.h
diff options
context:
space:
mode:
authorCallum Prentice <callum@mbp.localdomain>2023-01-26 10:37:59 -0800
committerCallum Prentice <callum@mbp.localdomain>2023-01-26 10:37:59 -0800
commitfb00bce81ad201b5f1798ff5d5afe8c4dcabda54 (patch)
treea157a9f0ec2648cf7d2281a8019b52b8468111f9 /indra/llcommon/llsys.h
parent66f59478d09122ddf43c4ba3445754d1698bf016 (diff)
parentf3cd329b585ef55a66f2a824f010d1a54d67d8d2 (diff)
Merge branch 'xcode-14.1' into DRTVWR-489-emoji
Diffstat (limited to 'indra/llcommon/llsys.h')
-rw-r--r--indra/llcommon/llsys.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llsys.h b/indra/llcommon/llsys.h
index 5ffbf5a732..70a03810c5 100644
--- a/indra/llcommon/llsys.h
+++ b/indra/llcommon/llsys.h
@@ -59,7 +59,7 @@ public:
S32 mBuild;
#ifndef LL_WINDOWS
- static S32 getMaxOpenFiles();
+ static long getMaxOpenFiles();
#endif
static bool is64Bit();