Changeset 3999 for pjproject/trunk/pjlib/src/pj/os_core_win32.c

Timestamp:

Mar 30, 2012 7:10:13 AM (13 years ago)

Author:

bennylp

Message:

Re #1474: Merged all changes from 1.12 - HEAD (from the 1.x branch)

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjlib/src/pj/os_core_win32.c (modified) (4 diffs)

pjproject/trunk/pjlib/src/pj/os_core_win32.c

@@ -118 +118 @@
 
 /*
+ * Flag and reference counter for PJLIB instance.
+ */
+static int initialized;
+
+/*
  * Static global variables.
  */
@@ -142 +147 @@
     pj_str_t guid;
     pj_status_t rc;
+
+    /* Check if PJLIB have been initialized */
+    if (initialized) {
+        ++initialized;
+        return PJ_SUCCESS;
+    }
 
     /* Init Winsock.. */
@@ -188 +199 @@
 #endif   
 
+    /* Flag PJLIB as initialized */
+    ++initialized;
+    pj_assert(initialized == 1);
+
     PJ_LOG(4,(THIS_FILE, "pjlib %s for win32 initialized",
               PJ_VERSION));
@@ -213 +228 @@
 {
     int i;
+
+    /* Only perform shutdown operation when 'initialized' reaches zero */
+    pj_assert(initialized > 0);
+    if (--initialized != 0)
+        return;
 
     /* Display stack usage */