sd-pppoe: fix namespacing

Prefix all exported constants by SD_PPPOE_* to avoid namespacing
conflicts.

diff --git a/src/libsystemd-network/sd-pppoe.c b/src/libsystemd-network/sd-pppoe.c
index c6c9da8..439d4ef 100644 (file)
--- a/src/libsystemd-network/sd-pppoe.c
+++ b/src/libsystemd-network/sd-pppoe.c
@@ -670,7 +670,7 @@ static int pppoe_handle_message(sd_pppoe *ppp, struct pppoe_hdr *packet, struct
 
                 ppp->timeout = sd_event_source_unref(ppp->timeout);
                 assert(ppp->cb);
-                ppp->cb(ppp, PPPOE_EVENT_RUNNING, ppp->userdata);
+                ppp->cb(ppp, SD_PPPOE_EVENT_RUNNING, ppp->userdata);
 
                 break;
         case PPPOE_STATE_RUNNING:
@@ -688,7 +688,7 @@ static int pppoe_handle_message(sd_pppoe *ppp, struct pppoe_hdr *packet, struct
                 ppp->state = PPPOE_STATE_STOPPED;
 
                 assert(ppp->cb);
-                ppp->cb(ppp, PPPOE_EVENT_STOPPED, ppp->userdata);
+                ppp->cb(ppp, SD_PPPOE_EVENT_STOPPED, ppp->userdata);
 
                 break;
         case PPPOE_STATE_STOPPED:

diff --git a/src/libsystemd-network/test-pppoe.c b/src/libsystemd-network/test-pppoe.c
index 72878f4..6d71569 100644 (file)
--- a/src/libsystemd-network/test-pppoe.c
+++ b/src/libsystemd-network/test-pppoe.c
@@ -41,12 +41,12 @@ static void pppoe_handler(sd_pppoe *ppp, int event, void *userdata) {
         assert_se(e);
 
         switch (event) {
-        case PPPOE_EVENT_RUNNING:
+        case SD_PPPOE_EVENT_RUNNING:
                 assert_se(pppoe_state == -1);
                 log_info("running");
                 break;
-        case PPPOE_EVENT_STOPPED:
-                assert_se(pppoe_state == PPPOE_EVENT_RUNNING);
+        case SD_PPPOE_EVENT_STOPPED:
+                assert_se(pppoe_state == SD_PPPOE_EVENT_RUNNING);
                 log_info("stopped");
                 assert_se(sd_event_exit(e, 0) >= 0);
                 break;

diff --git a/src/systemd/sd-pppoe.h b/src/systemd/sd-pppoe.h
index 318d2f0..90878ff 100644 (file)
--- a/src/systemd/sd-pppoe.h
+++ b/src/systemd/sd-pppoe.h
@@ -30,8 +30,8 @@
 #include "sparse-endian.h"
 
 enum {
-        PPPOE_EVENT_RUNNING                     = 0,
-        PPPOE_EVENT_STOPPED                     = 1,
+        SD_PPPOE_EVENT_RUNNING          = 0,
+        SD_PPPOE_EVENT_STOPPED          = 1,
 };
 
 typedef struct sd_pppoe sd_pppoe;