Bustage fix. r=me
authorEKR <ekr@rtfm.com>
Wed, 03 Feb 2016 08:44:16 -0800
changeset 11843 775ed89344d614c6925bb19d82628347dc351f2b
parent 11842 6c3d579ee42229e9a6f4f64b8e514aa6fdcdcf67
child 11844 9ad8f193be3abc60f3433982b92e0a54f1b64063
push id957
push userekr@mozilla.com
push dateWed, 03 Feb 2016 16:45:14 +0000
reviewersme
Bustage fix. r=me
lib/ssl/tls13con.c
lib/ssl/tls13con.h
--- a/lib/ssl/tls13con.c
+++ b/lib/ssl/tls13con.c
@@ -86,20 +86,16 @@ const char kHkdfPurposeClientWriteKey[] 
 const char kHkdfPurposeServerWriteKey[] = "server write key";
 const char kHkdfPurposeClientWriteIv[] = "client write iv";
 const char kHkdfPurposeServerWriteIv[] = "server write iv";
 const char kClientFinishedLabel[] = "client finished";
 const char kServerFinishedLabel[] = "server finished";
 
 const SSL3ProtocolVersion kRecordVersion = 0x0301U;
 
-#if defined(WIN32)
-#define __func__ __FUNCTION__
-#endif
-
 #define FATAL_ERROR(ss, prError, desc) do { \
     SSL_TRC(3, ("%d: TLS13[%d]: fatal error %d in %s (%s:%d)", \
                 SSL_GETPID(), ss->fd, prError, __func__, __FILE__, __LINE__)); \
     tls13_FatalError(ss, prError, desc); \
 } while(0)
 
 #define UNIMPLEMENTED() do { \
     SSL_TRC(3, ("%d: TLS13[%d]: unimplemented feature in %s (%s:%d)", \
--- a/lib/ssl/tls13con.h
+++ b/lib/ssl/tls13con.h
@@ -15,16 +15,20 @@ typedef enum {
 } SharedSecretType;
 
 SECStatus tls13_UnprotectRecord(
     sslSocket* ss, SSL3Ciphertext *cText, sslBuffer *plaintext,
     SSL3AlertDescription *alert);
 unsigned char *
 tls13_EncodeUintX(PRUint32 value, unsigned int bytes, unsigned char *to);
 
+#if defined(WIN32)
+#define __func__ __FUNCTION__
+#endif
+
 void tls13_SetHsState(sslSocket *ss, SSL3WaitState ws,
                       const char *func, const char *file, int line);
 #define TLS13_SET_HS_STATE(ss, ws) \
     tls13_SetHsState(ss, ws, __func__, __FILE__, __LINE__)
 
 /* Return PR_TRUE if the socket is in one of the given states, else return
  * PR_FALSE. Only call the macro not the function, because the trailing
  * wait_invalid is needed to terminate the argument list. */