Changeset 1581 for pjproject

Timestamp:

Nov 16, 2007 3:49:01 AM (17 years ago)

Author:

bennylp

Message:

Fixed bug in PJ_DECL_NO_RETURN macro which prevents building libraries as DLL

File:

• pjproject/trunk/pjlib/include/pj/config.h (modified) (2 diffs)

pjproject/trunk/pjlib/include/pj/config.h

@@ -696 +696 @@
 
 /**
- * @def PJ_DECL_NO_RETURN(type)
- * @param type The return type of the function.
- * Declare a function that will not return.
- */
-/**
- * @def PJ_BEGIN_DECL
- * Mark beginning of declaration section in a header file.
- */
-/**
- * @def PJ_END_DECL
- * Mark end of declaration section in a header file.
- */
-#ifdef __cplusplus
-#  define PJ_DECL_NO_RETURN(type)   type PJ_NORETURN
-#  define PJ_IDECL_NO_RETURN(type)  PJ_INLINE(type) PJ_NORETURN
-#  define PJ_BEGIN_DECL             extern "C" {
-#  define PJ_END_DECL               }
-#else
-#  define PJ_DECL_NO_RETURN(type)   PJ_NORETURN type
-#  define PJ_IDECL_NO_RETURN(type)  PJ_NORETURN PJ_INLINE(type)
-#  define PJ_BEGIN_DECL
-#  define PJ_END_DECL
-#endif
-
-
-/**
  * This macro declares platform/compiler specific specifier prefix
  * to be added to symbol declaration to export the symbol when PJLIB
@@ -800 +774 @@
 
 /**
+ * @def PJ_DECL_NO_RETURN(type)
+ * @param type The return type of the function.
+ * Declare a function that will not return.
+ */
+/**
+ * @def PJ_BEGIN_DECL
+ * Mark beginning of declaration section in a header file.
+ */
+/**
+ * @def PJ_END_DECL
+ * Mark end of declaration section in a header file.
+ */
+#ifdef __cplusplus
+#  define PJ_DECL_NO_RETURN(type)   PJ_DECL(type) PJ_NORETURN
+#  define PJ_IDECL_NO_RETURN(type)  PJ_INLINE(type) PJ_NORETURN
+#  define PJ_BEGIN_DECL             extern "C" {
+#  define PJ_END_DECL               }
+#else
+#  define PJ_DECL_NO_RETURN(type)   PJ_NORETURN PJ_DECL(type)
+#  define PJ_IDECL_NO_RETURN(type)  PJ_NORETURN PJ_INLINE(type)
+#  define PJ_BEGIN_DECL
+#  define PJ_END_DECL
+#endif
+
+
+
+/**
  * @def PJ_DECL_DATA(type)
  * @param type The data type.