Changeset eb083ad in mainline for uspace/srv/locsrv

Timestamp:

2012-05-17T21:09:06Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8fde078

Parents:

a8b8086 (diff), 3e67ab1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

Location:

uspace/srv/locsrv

Files:

• Makefile (moved) (moved from uspace/srv/loc/Makefile ) (1 diff)
• category.c (moved) (moved from uspace/srv/loc/category.c ) (1 diff)
• category.h (moved) (moved from uspace/srv/loc/category.h ) (1 diff)
• locsrv.c (moved) (moved from uspace/srv/loc/loc.c ) (1 diff)
• locsrv.h (moved) (moved from uspace/srv/loc/loc.h ) (1 diff)

uspace/srv/locsrv/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
-BINARY = loc
+BINARY = locsrv
 STATIC_NEEDED = y
 
 SOURCES = \
         category.c \
-        loc.c
+        locsrv.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/srv/locsrv/category.c

@@ -40 +40 @@
 
 #include "category.h"
-#include "loc.h"
+#include "locsrv.h"
 
 /** Initialize category directory. */

uspace/srv/locsrv/category.h

@@ -37 +37 @@
 
 #include <adt/list.h>
-#include "loc.h"
+#include "locsrv.h"
 
 typedef sysarg_t catid_t;

uspace/srv/locsrv/locsrv.c

@@ -51 +51 @@
 
 #include "category.h"
-#include "loc.h"
+#include "locsrv.h"
 
 #define NAME          "loc"

uspace/srv/locsrv/locsrv.h

@@ -33 +33 @@
  */
 
-#ifndef LOC_H_
-#define LOC_H_
+#ifndef LOCSRV_H_
+#define LOCSRV_H_
 
 #include <ipc/loc.h>