aboutsummaryrefslogtreecommitdiff
path: root/source/s_shiftRightJam64Extra.c
diff options
context:
space:
mode:
authorJohn Hauser <jhauser@eecs.berkeley.edu>2015-01-15 16:04:25 -0800
committerJohn Hauser <jhauser@eecs.berkeley.edu>2015-01-15 16:04:25 -0800
commit17ab1f4a0a83fd20d75eb01e2e54c2622bcc1a13 (patch)
tree39851068636c852f19cba076b530f508ca6584df /source/s_shiftRightJam64Extra.c
parent9dd97e234d676ffdaf6a7b64d05e712651438a8a (diff)
downloadberkeley-softfloat-3-17ab1f4a0a83fd20d75eb01e2e54c2622bcc1a13.zip
berkeley-softfloat-3-17ab1f4a0a83fd20d75eb01e2e54c2622bcc1a13.tar.gz
berkeley-softfloat-3-17ab1f4a0a83fd20d75eb01e2e54c2622bcc1a13.tar.bz2
Fixed conflicts over definitions of inline functions for non-GCC compilers.
Reboot official release date to be 2015 Jan 9.
Diffstat (limited to 'source/s_shiftRightJam64Extra.c')
-rw-r--r--source/s_shiftRightJam64Extra.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/s_shiftRightJam64Extra.c b/source/s_shiftRightJam64Extra.c
index 6d80085..b1f4056 100644
--- a/source/s_shiftRightJam64Extra.c
+++ b/source/s_shiftRightJam64Extra.c
@@ -4,10 +4,10 @@
This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
Package, Release 3, by John R. Hauser.
-Copyright 2011, 2012, 2013, 2014 The Regents of the University of California
-(Regents). All Rights Reserved. Redistribution and use in source and binary
-forms, with or without modification, are permitted provided that the following
-conditions are met:
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California (Regents). All Rights Reserved. Redistribution and use in source
+and binary forms, with or without modification, are permitted provided that
+the following conditions are met:
Redistributions of source code must retain the above copyright notice,
this list of conditions, and the following two paragraphs of disclaimer.
@@ -33,7 +33,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#include <stdint.h>
#include "platform.h"
-#include "primitives.h"
+#include "primitiveTypes.h"
#ifndef softfloat_shiftRightJam64Extra