Changeset 66:ceb29224b3ad in mediastreamer2 for linphone/oRTP/src/stun.c

Timestamp:

Oct 5, 2008 4:35:36 PM (5 years ago)

Author:

aymeric <aymeric@…>

Branch:

default

Message:

rename macro to avoid conflict

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@69 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

File:

• linphone/oRTP/src/stun.c (modified) (3 diffs)

linphone/oRTP/src/stun.c

@@ -381 +381 @@
             }
       }
-      else if (atrType == Username)
+      else if (atrType == STUNUsername)
       {
             msg->hasUsername = TRUE;
@@ -395 +395 @@
             }                                   
       }
-      else if (atrType == Password)
+      else if (atrType == STUNPassword)
       {
             msg->hasPassword = TRUE;
@@ -678 +678 @@
    {
       if (verbose) ortp_message("stun: Encoding Username: %s\n", msg->username.value );
-      ptr = encodeAtrString(ptr, Username, &msg->username);
+      ptr = encodeAtrString(ptr, STUNUsername, &msg->username);
    }
    if (msg->hasPassword)
    {
       if (verbose) ortp_message("stun: Encoding Password: %s\n", msg->password.value );
-      ptr = encodeAtrString(ptr, Password, &msg->password);
+      ptr = encodeAtrString(ptr, STUNPassword, &msg->password);
    }
    if (msg->hasErrorCode)