Changeset 622 for pjproject/trunk/pjlib/include/pj/compat/cc_gcc.h

Timestamp:

Jul 22, 2006 1:42:56 PM (18 years ago)

Author:

bennylp

Message:

Changed all public header files to compile correctly when -ansi and -pedantic is used, also when g++ is used

File:

• pjproject/trunk/pjlib/include/pj/compat/cc_gcc.h (modified) (1 diff)

pjproject/trunk/pjlib/include/pj/compat/cc_gcc.h

@@ -35 +35 @@
 
 
-#define PJ_INLINE_SPECIFIER     static inline
 #define PJ_THREAD_FUNC  
 #define PJ_NORETURN             
-#define PJ_ATTR_NORETURN        __attribute__ ((noreturn))
 
 #define PJ_HAS_INT64            1
 
-typedef long long pj_int64_t;
-typedef unsigned long long pj_uint64_t;
+#ifdef __STRICT_ANSI__
+  #include <inttypes.h> 
+  typedef int64_t               pj_int64_t;
+  typedef uint64_t              pj_uint64_t;
+  #define PJ_INLINE_SPECIFIER   static __inline
+  #define PJ_ATTR_NORETURN      
+#else
+  typedef long long             pj_int64_t;
+  typedef unsigned long long    pj_uint64_t;
+  #define PJ_INLINE_SPECIFIER   static inline
+  #define PJ_ATTR_NORETURN      __attribute__ ((noreturn))
+#endif
 
 #define PJ_INT64(val)           val##LL