Revision: 55588
http://sourceforge.net/p/brlcad/code/55588
Author: starseeker
Date: 2013-05-29 18:41:30 +0000 (Wed, 29 May 2013)
Log Message:
-----------
Don't (re)define off_t unless we have to - try sys/types.h first except in the
case of Windows.
Modified Paths:
--------------
brlcad/trunk/src/other/libregex/regex.h
Modified: brlcad/trunk/src/other/libregex/regex.h
===================================================================
--- brlcad/trunk/src/other/libregex/regex.h 2013-05-29 18:23:16 UTC (rev
55587)
+++ brlcad/trunk/src/other/libregex/regex.h 2013-05-29 18:41:30 UTC (rev
55588)
@@ -54,9 +54,6 @@
#if defined(_WIN32) && !defined(_OFF_T_DEFINED)
typedef SSIZE_T off_t;
# define _OFF_T_DEFINED 1
-#elif !defined(__APPLE__) && !defined(__off_t_defined)
- typedef ptrdiff_t off_t;
-# define __off_t_defined 1
#endif
/* On Windows 64bit, "off_t" is defined as a "long"
@@ -67,6 +64,13 @@
*/
#include <sys/types.h>
+
+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__off_t_defined) &&
!defined(_OFF_T_DECLARED)
+ typedef ptrdiff_t off_t;
+# define __off_t_defined 1
+# define _OFF_T_DECLARED 1
+#endif
+
#include <stdio.h>
#include <string.h>
#include <ctype.h>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET
Get 100% visibility into your production application - at no cost.
Code-level diagnostics for performance bottlenecks with <2% overhead
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap1
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
