tests: Fix MPLS tests.

[cascardo/ovs.git] / lib / stream-nossl.c

diff --git a/lib/stream-nossl.c b/lib/stream-nossl.c
index cdbbf5d..26fcc97 100644 (file)
--- a/lib/stream-nossl.c
+++ b/lib/stream-nossl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Nicira Networks.
+ * Copyright (c) 2011 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 #include <config.h>
 #include "stream-ssl.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(stream_nossl);
 \f
@@ -28,7 +28,7 @@ stream_ssl_is_configured(void)
     return false;
 }
 
-static void NO_RETURN
+OVS_NO_RETURN static void
 nossl_option(const char *detail)
 {
     VLOG_FATAL("%s specified but Open vSwitch was built without SSL support",